diff options
| author | Chris Parsons <cparsons@google.com> | 2021-05-18 18:35:24 -0400 |
|---|---|---|
| committer | Chris Parsons <cparsons@google.com> | 2021-05-20 12:05:24 -0400 |
| commit | d6358775c85d764d65e6ae819e23889545b9633e (patch) | |
| tree | 1846622af21b3e7ebb4cc8a3bfc87a1d40be11b5 /cc/library_headers.go | |
| parent | 50d601731b0e5a99f94b0c092c28532199deb113 (diff) | |
| download | soong-d6358775c85d764d65e6ae819e23889545b9633e.tar.gz | |
Propagate unexported deps via implementation_deps
Test: bp2build and mixed_libc CI
Test: Manually verified that libc_bionic_ndk compilation gets the
appropriate headers (and no extra headers) from downstream
Change-Id: I79eb6e8ec1d415bd50d12105da4cf97101f95474
Diffstat (limited to 'cc/library_headers.go')
| -rw-r--r-- | cc/library_headers.go | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/cc/library_headers.go b/cc/library_headers.go index 0aba8dea8..20659292d 100644 --- a/cc/library_headers.go +++ b/cc/library_headers.go @@ -109,10 +109,11 @@ func prebuiltLibraryHeaderFactory() android.Module { } type bazelCcLibraryHeadersAttributes struct { - Copts bazel.StringListAttribute - Hdrs bazel.LabelListAttribute - Includes bazel.StringListAttribute - Deps bazel.LabelListAttribute + Copts bazel.StringListAttribute + Hdrs bazel.LabelListAttribute + Includes bazel.StringListAttribute + Deps bazel.LabelListAttribute + Implementation_deps bazel.LabelListAttribute } type bazelCcLibraryHeaders struct { @@ -147,9 +148,10 @@ func CcLibraryHeadersBp2Build(ctx android.TopDownMutatorContext) { linkerAttrs := bp2BuildParseLinkerProps(ctx, module) attrs := &bazelCcLibraryHeadersAttributes{ - Copts: compilerAttrs.copts, - Includes: exportedIncludes, - Deps: linkerAttrs.deps, + Copts: compilerAttrs.copts, + Includes: exportedIncludes, + Implementation_deps: linkerAttrs.deps, + Deps: linkerAttrs.exportedDeps, } props := bazel.BazelTargetModuleProperties{ |