diff options
| author | Liz Kammer <eakammer@google.com> | 2021-09-09 14:08:21 -0400 |
|---|---|---|
| committer | Liz Kammer <eakammer@google.com> | 2021-09-09 15:59:05 -0400 |
| commit | 5fad501aeb390010d0d09a88fdcbca5662cc753b (patch) | |
| tree | bad110a7c30dcfe7e9408921262ffbf875babff6 /cc/library_headers.go | |
| parent | 4011ebb12d1e474ef6aa2c1895ea32f72b03200f (diff) | |
| download | soong-5fad501aeb390010d0d09a88fdcbca5662cc753b.tar.gz | |
bp2build: Split export_{includes,system_includes}
The specification of exporting includes vs system includes has an impact
on inclusion sort order. Conflating the two caused some symbols to not
be resolved correctly.
Bug: 198403271
Test: build/bazel/ci/bp2build.sh
Test: USE_BAZEL_ANALYSIS=1 m libbacktrace_no_dex succeeds with libc++_*
modules removed from mixed build denylist (would fail otherwise)
Change-Id: I08aff253d8962dc678ed10214b1c171330e0fe19
Diffstat (limited to 'cc/library_headers.go')
| -rw-r--r-- | cc/library_headers.go | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/cc/library_headers.go b/cc/library_headers.go index 44a7a714f..30a81cc39 100644 --- a/cc/library_headers.go +++ b/cc/library_headers.go @@ -103,12 +103,13 @@ func prebuiltLibraryHeaderFactory() android.Module { } type bazelCcLibraryHeadersAttributes struct { - Copts bazel.StringListAttribute - Hdrs bazel.LabelListAttribute - Includes bazel.StringListAttribute - Deps bazel.LabelListAttribute - Implementation_deps bazel.LabelListAttribute - System_dynamic_deps bazel.LabelListAttribute + Copts bazel.StringListAttribute + Hdrs bazel.LabelListAttribute + Export_includes bazel.StringListAttribute + Export_system_includes bazel.StringListAttribute + Deps bazel.LabelListAttribute + Implementation_deps bazel.LabelListAttribute + System_dynamic_deps bazel.LabelListAttribute } func CcLibraryHeadersBp2Build(ctx android.TopDownMutatorContext) { @@ -131,11 +132,12 @@ func CcLibraryHeadersBp2Build(ctx android.TopDownMutatorContext) { linkerAttrs := bp2BuildParseLinkerProps(ctx, module) attrs := &bazelCcLibraryHeadersAttributes{ - Copts: compilerAttrs.copts, - Includes: exportedIncludes, - Implementation_deps: linkerAttrs.deps, - Deps: linkerAttrs.exportedDeps, - System_dynamic_deps: linkerAttrs.systemDynamicDeps, + Copts: compilerAttrs.copts, + Export_includes: exportedIncludes.Includes, + Export_system_includes: exportedIncludes.SystemIncludes, + Implementation_deps: linkerAttrs.deps, + Deps: linkerAttrs.exportedDeps, + System_dynamic_deps: linkerAttrs.systemDynamicDeps, } props := bazel.BazelTargetModuleProperties{ |