diff options
author | Dan Willemsen <dwillemsen@google.com> | 2016-07-13 10:45:01 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@google.com> | 2016-07-13 10:45:01 -0700 |
commit | e6c7f1836499a1544c94964e0b87d2dfdb3b92d4 (patch) | |
tree | fc5dcd98c5dc17ba3ceaf3e207b2bdf538721ae7 | |
parent | 75ab80882e6f4f48f3b3ed46c7d2ab2da9be9258 (diff) | |
download | build_soong-e6c7f1836499a1544c94964e0b87d2dfdb3b92d4.tar.gz build_soong-e6c7f1836499a1544c94964e0b87d2dfdb3b92d4.tar.bz2 build_soong-e6c7f1836499a1544c94964e0b87d2dfdb3b92d4.zip |
Fix LOCAL_EXPORT_C_INCLUDE_DIRS processingandroid-wear-n-preview-2
In order to strip the -I from the beginning of each flag, the androidmk
functionality expected every flag to be distinct. The existing
functionality was combining them with spaces if a module exported more
than one include directory at a time.
Change-Id: Ief5e22061c58f3d987557e938bae880509ffb121
-rw-r--r-- | cc/cc.go | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1490,7 +1490,9 @@ type flagExporter struct { func (f *flagExporter) exportIncludes(ctx ModuleContext, inc string) { includeDirs := android.PathsForModuleSrc(ctx, f.Properties.Export_include_dirs) - f.flags = append(f.flags, android.JoinWithPrefix(includeDirs.Strings(), inc)) + for _, dir := range includeDirs.Strings() { + f.flags = append(f.flags, inc + dir) + } } func (f *flagExporter) reexportFlags(flags []string) { |