tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ignore license and similar dependencies of prebuilt_apex/apex_set am: fee8cf36e3

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15132673

Change-Id: I88690c5637ab0e3a67415afa19fcfef0707b2b78
This commit is contained in:
Paul Duffin 2021-06-29 23:06:29 +00:00 committed by Automerger Merge Worker
commit d7be777f25
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apex/prebuilt.go
View file

@ -375,6 +375,12 @@ func (p *prebuiltCommon) apexInfoMutator(mctx android.TopDownMutatorContext) {
}
}
// Ignore any modules that do not implement ApexModule as they cannot have an APEX specific
// variant.
if _, ok := child.(android.ApexModule); !ok {
return false
}
// Strip off the prebuilt_ prefix if present before storing content to ensure consistent
// behavior whether there is a corresponding source module present or not.
depName = android.RemoveOptionalPrebuiltPrefix(depName)