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

Merge "Avoid calling DepIsInSameApex when excluded from apex contents" am: 9c2e6d50b4 am: 46a694ba85

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3b078034869c482a624c66b1093fb97e0ae6871
This commit is contained in:
Paul Duffin
2021-03-11 02:19:40 +00:00
committed by Automerger Merge Worker
parent e6bced0c4f 46a694ba85
commit 4ea76e8caf
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/apex.go
View File

@@ -974,6 +974,10 @@ func markPlatformAvailability(mctx android.BottomUpMutatorContext) {
// If any of the dep is not available to platform, this module is also considered as being // If any of the dep is not available to platform, this module is also considered as being
// not available to platform even if it has "//apex_available:platform" // not available to platform even if it has "//apex_available:platform"
mctx.VisitDirectDeps(func(child android.Module) { mctx.VisitDirectDeps(func(child android.Module) {
depTag := mctx.OtherModuleDependencyTag(child)
if _, ok := depTag.(android.ExcludeFromApexContentsTag); ok {
return
}
if !am.DepIsInSameApex(mctx, child) { if !am.DepIsInSameApex(mctx, child) {
// if the dependency crosses apex boundary, don't consider it // if the dependency crosses apex boundary, don't consider it
return return