diff options
| author | 2022-12-14 11:34:54 -0500 | |
|---|---|---|
| committer | 2022-12-14 18:54:47 -0500 | |
| commit | b6803a5f52cb152869abda9a9b870122d8704e56 (patch) | |
| tree | d3d2c636b61cab2c9d526c7569cd46403aa4f9cf /apex/apex.go | |
| parent | ccfe6022d445b1fecc161c073033ef3e999a3b41 (diff) | |
Add ApexInfo.RequiresLibs to mixed build handler for apex
Adding ApexInfo.RequiresLibs from Bazel to apexBundle.requiredDeps which is eventuallyread by apex androidmk writer for LOCAL_REQUIRED_MODULES to ensures the libs are installed as part of a bundle build.
In Soong, apexBundle.requiredDeps is set in
https://cs.android.com/android/platform/build/soong/+/master:apex/apex.go;l=2305-2323;drc=cb7e73bc0130a95f5991c925c349387185abc098
The same logic is replicated in Bazel at
https://cs.android.com/android/platform/build/bazel/+/master:rules/apex/cc.bzl;l=141-163;drc=cb7e73bc0130a95f5991c925c349387185abc098.
This CL is porting the required libs set by Bazel in mixed build.
Test: go test
Test: run build/bazel/ci/mixed_libc.sh
Bug: 215500321
Change-Id: Id7256d279ac09a8fd42db391a7e93ce0021d8345
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apex/apex.go b/apex/apex.go index 01e4f1222..36ce658ed 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1906,6 +1906,12 @@ func (a *apexBundle) ProcessBazelQueryResponse(ctx android.ModuleContext) { a.containerCertificateFile = android.PathForBazelOut(ctx, outputs.ContainerKeyInfo[0]) a.containerPrivateKeyFile = android.PathForBazelOut(ctx, outputs.ContainerKeyInfo[1]) + // Ensure ApexInfo.RequiresLibs are installed as part of a bundle build + for _, bazelLabel := range outputs.RequiresLibs { + // convert Bazel label back to Soong module name + a.requiredDeps = append(a.requiredDeps, android.ModuleFromBazelLabel(bazelLabel)) + } + apexType := a.properties.ApexType switch apexType { case imageApex: |