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

Merge "Static variant deps are not considered as being in the same APEX" am: 4c89f3e11f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1538627

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05465d23c7f4a34a3ae21672802f5f30d5a65c0c
This commit is contained in:
Treehugger Robot
2021-01-06 06:30:43 +00:00
committed by Automerger Merge Worker
parent eac4e2c889 4c89f3e11f
commit 1735a305c7
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/cc.go
View File

@@ -3096,6 +3096,12 @@ func (c *Module) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Modu
// We don't track beyond LLNDK or from an implementation library to its stubs. // We don't track beyond LLNDK or from an implementation library to its stubs.
return false return false
} }
if depTag == staticVariantTag {
// This dependency is for optimization (reuse *.o from the static lib). It doesn't
// actually mean that the static lib (and its dependencies) are copied into the
// APEX.
return false
}
return true return true
} }