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." am: e6f4ee2061

Browse Source 
am: e18f12064b

Change-Id: If16929a6aad4c8e338e393602d48bb4ce2d79613
This commit is contained in:
Steven Moreland
2018-01-09 00:55:33 +00:00
committed by android-build-merger
parent 5f4546febd e18f12064b
commit eb1c01eb70
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
// vendor variant of this library. This will overwrite
// 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 {
if ctx.useVndk() && f.Properties.Target.Vendor.Export_include_dirs != nil {
return android.PathsForModuleSrc(ctx, f.Properties.Target.Vendor.Export_include_dirs)
if ctx.useVndk() && f.Properties.Target.Vendor.Override_export_include_dirs != nil {
return android.PathsForModuleSrc(ctx, f.Properties.Target.Vendor.Override_export_include_dirs)
} else {
return android.PathsForModuleSrc(ctx, f.Properties.Export_include_dirs)
}