Drop "prebuilt_" prefixes from names registered in ApexInfo.InApexXxx.
Neither InApexVariants nor InApexModules should have them. This allows us to get rid of InApexVariantByBaseName as well. Test: m nothing Test: m nothing SOONG_CONFIG_art_module_source_build=false Bug: 180325915 Change-Id: Icbe4e025ce1a4c8dd258ff95d326ca2f27905188
This commit is contained in:
@@ -228,10 +228,11 @@ func (p *prebuiltCommon) apexInfoMutator(mctx android.TopDownMutatorContext) {
|
||||
})
|
||||
|
||||
// Create an ApexInfo for the prebuilt_apex.
|
||||
apexVariationName := android.RemoveOptionalPrebuiltPrefix(mctx.ModuleName())
|
||||
apexInfo := android.ApexInfo{
|
||||
ApexVariationName: android.RemoveOptionalPrebuiltPrefix(mctx.ModuleName()),
|
||||
InApexVariants: []string{mctx.ModuleName()},
|
||||
InApexModules: []string{mctx.ModuleName()},
|
||||
ApexVariationName: apexVariationName,
|
||||
InApexVariants: []string{apexVariationName},
|
||||
InApexModules: []string{apexVariationName},
|
||||
ApexContents: []*android.ApexContents{apexContents},
|
||||
ForPrebuiltApex: true,
|
||||
}
|
||||
|
Reference in New Issue
Block a user