cc: Make export_header_lib_headers configurable
Fixes: 374393110
Test: m nothing --no-skip-soong-tests
Change-Id: I8acee12f8b8ff7f59a733f4bea279df8bf3752d5
diff --git a/cc/linker.go b/cc/linker.go
index 1efacad..f9d58ea 100644
--- a/cc/linker.go
+++ b/cc/linker.go
@@ -85,7 +85,7 @@
// list of header libraries to re-export include directories from. Entries must be
// present in header_libs.
- Export_header_lib_headers []string `android:"arch_variant"`
+ Export_header_lib_headers proptools.Configurable[[]string] `android:"arch_variant,variant_prepend"`
// list of generated headers to re-export include directories from. Entries must be
// present in generated_headers.
@@ -302,7 +302,7 @@
deps.SharedLibs = append(deps.SharedLibs, linker.Properties.Shared_libs.GetOrDefault(ctx, nil)...)
deps.RuntimeLibs = append(deps.RuntimeLibs, linker.Properties.Runtime_libs...)
- deps.ReexportHeaderLibHeaders = append(deps.ReexportHeaderLibHeaders, linker.Properties.Export_header_lib_headers...)
+ deps.ReexportHeaderLibHeaders = append(deps.ReexportHeaderLibHeaders, linker.Properties.Export_header_lib_headers.GetOrDefault(ctx, nil)...)
deps.ReexportStaticLibHeaders = append(deps.ReexportStaticLibHeaders, linker.Properties.Export_static_lib_headers...)
deps.ReexportSharedLibHeaders = append(deps.ReexportSharedLibHeaders, linker.Properties.Export_shared_lib_headers...)
deps.ReexportGeneratedHeaders = append(deps.ReexportGeneratedHeaders, linker.Properties.Export_generated_headers...)