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

Avoid calling DepIsInSameApex when excluded from apex contents

Browse Source 
While debugging an issue with some work I was doing on boot image
modules I noticed that markPlatformAvailability() is calling
DepIsInSameApex() even when the dependency tag indicates that it is
excluded from the apex contents.

Test: m droid
Change-Id: Iac49049546a886f7a3a0d9640ffd31ce24c61364
This commit is contained in:
Paul Duffin
2021-03-10 15:25:59 +00:00
parent a3cb2b396f
commit e9612824ea
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

@@ -970,6 +970,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