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

Merge "Allow dependencies from platform variants to APEX modules (reland)." am: 313a349d6b am: bb4aa7c1c1 am: da18e6832b

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

Change-Id: I9e836e76724a9d8b20970bc77159eca1f45b7e81
This commit is contained in:
Martin Stjernholm
2021-04-06 18:24:59 +00:00
committed by Automerger Merge Worker
parent 8cb6f47cde da18e6832b
commit ae15fe4e2b
2 changed files with 64 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apex/apex.go
View File

@@ -1049,6 +1049,16 @@ func apexMutator(mctx android.BottomUpMutatorContext) {
if a, ok := mctx.Module().(*apexBundle); ok && !a.vndkApex {
apexBundleName := mctx.ModuleName()
mctx.CreateVariations(apexBundleName)
if strings.HasPrefix(apexBundleName, "com.android.art") {
// Create an alias from the platform variant. This is done to make
// test_for dependencies work for modules that are split by the APEX
// mutator, since test_for dependencies always go to the platform variant.
// This doesn't happen for normal APEXes that are disjunct, so only do
// this for the overlapping ART APEXes.
// TODO(b/183882457): Remove this if the test_for functionality is
// refactored to depend on the proper APEX variants instead of platform.
mctx.CreateAliasVariation("", apexBundleName)
}
} else if o, ok := mctx.Module().(*OverrideApex); ok {
apexBundleName := o.GetOverriddenModuleName()
if apexBundleName == "" {
@@ -1056,6 +1066,10 @@ func apexMutator(mctx android.BottomUpMutatorContext) {
return
}
mctx.CreateVariations(apexBundleName)
if strings.HasPrefix(apexBundleName, "com.android.art") {
// TODO(b/183882457): See note for CreateAliasVariation above.
mctx.CreateAliasVariation("", apexBundleName)
}
}
}