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

Merge "APEX can depend on non-APEX module and vice versa" into main am: 39011ef40c

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

Change-Id: I088a4b942d40a17c6bcf51d3b48645b50393d536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jiyong Park
2024-04-08 23:19:46 +00:00
committed by Automerger Merge Worker
parent 394158399e 39011ef40c
commit d300e50dec
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
apex/apex.go
View File

@@ -1298,30 +1298,26 @@ func apexMutator(mctx android.BottomUpMutatorContext) {
} }
// apexBundle itself is mutated so that it and its dependencies have the same apex variant. // apexBundle itself is mutated so that it and its dependencies have the same apex variant.
if ai, ok := mctx.Module().(ApexInfoMutator); ok && apexModuleTypeRequiresVariant(ai) { // Note that a default variation "" is also created as an alias, and the default dependency
apexBundleName := ai.ApexVariationName() // variation is set to the default variation. This is to allow an apex to depend on another
// module which is outside of the apex. This is because the dependent module is not mutated
// for this apex variant.
createApexVariation := func(apexBundleName string) {
defaultVariation := ""
mctx.SetDefaultDependencyVariation(&defaultVariation)
mctx.CreateVariations(apexBundleName) mctx.CreateVariations(apexBundleName)
if strings.HasPrefix(apexBundleName, "com.android.art") { mctx.CreateAliasVariation(defaultVariation, apexBundleName)
// 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)
} }
if ai, ok := mctx.Module().(ApexInfoMutator); ok && apexModuleTypeRequiresVariant(ai) {
createApexVariation(ai.ApexVariationName())
} else if o, ok := mctx.Module().(*OverrideApex); ok { } else if o, ok := mctx.Module().(*OverrideApex); ok {
apexBundleName := o.GetOverriddenModuleName() apexBundleName := o.GetOverriddenModuleName()
if apexBundleName == "" { if apexBundleName == "" {
mctx.ModuleErrorf("base property is not set") mctx.ModuleErrorf("base property is not set")
return return
} }
mctx.CreateVariations(apexBundleName) createApexVariation(apexBundleName)
if strings.HasPrefix(apexBundleName, "com.android.art") {
// TODO(b/183882457): See note for CreateAliasVariation above.
mctx.CreateAliasVariation("", apexBundleName)
}
} }
} }