StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't install system image copies of libraries in unbundled apex builds"

Browse Source
This commit is contained in:
Colin Cross
2023-01-27 19:27:54 +00:00
committed by Gerrit Code Review
parent dd60d3aa66 df2043e96a
commit a13de4dea4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apex/apex.go
View File

@@ -2389,7 +2389,10 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext,
// //
// Always include if we are a host-apex however since those won't have any // Always include if we are a host-apex however since those won't have any
// system libraries. // system libraries.
if ch.IsStubsImplementationRequired() && !am.DirectlyInAnyApex() { //
// Skip the dependency in unbundled builds where the device image is not
// being built.
if ch.IsStubsImplementationRequired() && !am.DirectlyInAnyApex() && !ctx.Config().UnbundledBuild() {
// we need a module name for Make // we need a module name for Make
name := ch.ImplementationModuleNameForMake(ctx) + ch.Properties.SubName name := ch.ImplementationModuleNameForMake(ctx) + ch.Properties.SubName
if !android.InList(name, a.makeModulesToInstall) { if !android.InList(name, a.makeModulesToInstall) {