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

Merge "Remove fallback workaround for APEX variants which is now unnecessary."

Browse Source
This commit is contained in:
Martin Stjernholm
2021-08-18 08:37:06 +00:00
committed by Gerrit Code Review
parent 91436f469a 0e17c1a57e
commit 3931b8c70d
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apex/apex.go
View File

@@ -1100,13 +1100,6 @@ func apexMutator(mctx android.BottomUpMutatorContext) {
mctx.ModuleErrorf("base property is not set") mctx.ModuleErrorf("base property is not set")
return return
} }
// Workaround the issue reported in b/191269918 by using the unprefixed module name of this
// module as the default variation to use if dependencies of this module do not have the correct
// apex variant name. This name matches the name used to create the variations of modules for
// which apexModuleTypeRequiresVariant return true.
// TODO(b/191269918): Remove this workaround.
unprefixedModuleName := android.RemoveOptionalPrebuiltPrefix(mctx.ModuleName())
mctx.SetDefaultDependencyVariation(&unprefixedModuleName)
mctx.CreateVariations(apexBundleName) mctx.CreateVariations(apexBundleName)
if strings.HasPrefix(apexBundleName, "com.android.art") { if strings.HasPrefix(apexBundleName, "com.android.art") {
// TODO(b/183882457): See note for CreateAliasVariation above. // TODO(b/183882457): See note for CreateAliasVariation above.