Add target.vendor.override_export_include_dirs.
This property was originally called export_include_dirs,
but because it has different semantics, it is renamed
here to override_export_include_dirs.
Bug: 62878521
Test: soong finds targets which use this property properly
Change-Id: Iac7c2a89ee8e389977c7a8e3b8c03c1a0d1608bb
diff --git a/cc/library.go b/cc/library.go
index d0a580c..4a900ef 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -100,7 +100,7 @@
// 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 @@
}
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)
}