StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add target.vendor.override_export_include_dirs."

Browse Source
This commit is contained in:
Treehugger Robot
2018-01-08 22:15:51 +00:00
committed by Gerrit Code Review
parent 8a832c3e6d b21df8f66f
commit e6f4ee2061
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/library.go
View File

@@ -100,7 +100,7 @@ type FlagExporterProperties struct {
// export_include_dirs, that will be applied to the // export_include_dirs, that will be applied to the
// vendor variant of this library. This will overwrite // vendor variant of this library. This will overwrite
// any other declarations. // any other declarations.
Export_include_dirs []string Override_export_include_dirs []string
} }
} }
} }
@@ -164,8 +164,8 @@ type flagExporter struct {
} }
func (f *flagExporter) exportedIncludes(ctx ModuleContext) android.Paths { func (f *flagExporter) exportedIncludes(ctx ModuleContext) android.Paths {
if ctx.useVndk() && f.Properties.Target.Vendor.Export_include_dirs != nil { if ctx.useVndk() && f.Properties.Target.Vendor.Override_export_include_dirs != nil {
return android.PathsForModuleSrc(ctx, f.Properties.Target.Vendor.Export_include_dirs) return android.PathsForModuleSrc(ctx, f.Properties.Target.Vendor.Override_export_include_dirs)
} else { } else {
return android.PathsForModuleSrc(ctx, f.Properties.Export_include_dirs) return android.PathsForModuleSrc(ctx, f.Properties.Export_include_dirs)
} }