openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Drop "prebuilt_" prefixes from names registered in ApexInfo.InApexXxx." 

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

Bug: 180325915
Change-Id: I1fd96bad2326612d153fed31308914902f58d3ec
Merged-In: Icbe4e025ce1a4c8dd258ff95d326ca2f27905188
(cherry picked from commit f4c44417a3c769be884ee1c2bdcd95689b5cecb4)
This commit is contained in:
Martin Stjernholm 2021-05-27 11:17:00 +00:00
parent ae5072fac3
commit c4f4cedc47
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
android/apex.go
View File

@ -117,19 +117,6 @@ func (i ApexInfo) InApexVariant(apexVariant string) bool {
return false return false
} }
// InApexByBaseName tells whether this apex variant of the module is part of the given apexVariant
// or not, where the APEX is specified by its canonical base name, i.e. typically beginning with
// "com.android.". In particular this function doesn't differentiate between source and prebuilt
// APEXes, where the latter may have "prebuilt_" prefixes.
func (i ApexInfo) InApexVariantByBaseName(apexVariant string) bool {
for _, a := range i.InApexVariants {
if RemoveOptionalPrebuiltPrefix(a) == apexVariant {
return true
}
}
return false
}
func (i ApexInfo) InApexModule(apexModuleName string) bool { func (i ApexInfo) InApexModule(apexModuleName string) bool {
for _, a := range i.InApexModules { for _, a := range i.InApexModules {
if a == apexModuleName { if a == apexModuleName {

7
apex/prebuilt.go
View File

@ -227,10 +227,11 @@ func (p *prebuiltCommon) apexInfoMutator(mctx android.TopDownMutatorContext) {
}) })
// Create an ApexInfo for the prebuilt_apex. // Create an ApexInfo for the prebuilt_apex.
apexVariationName := android.RemoveOptionalPrebuiltPrefix(mctx.ModuleName())
apexInfo := android.ApexInfo{ apexInfo := android.ApexInfo{
ApexVariationName: android.RemoveOptionalPrebuiltPrefix(mctx.ModuleName()), ApexVariationName: apexVariationName,
InApexVariants: []string{mctx.ModuleName()}, InApexVariants: []string{apexVariationName},
InApexModules: []string{mctx.ModuleName()}, InApexModules: []string{apexVariationName},
ApexContents: []*android.ApexContents{apexContents}, ApexContents: []*android.ApexContents{apexContents},
ForPrebuiltApex: true, ForPrebuiltApex: true,
} }

2
java/hiddenapi_singleton.go
View File

@ -171,7 +171,7 @@ func isModuleInConfiguredList(ctx android.BaseModuleContext, module android.Modu
// A platform variant is required but this is for an apex so ignore it. // A platform variant is required but this is for an apex so ignore it.
return false return false
} }
} else if !apexInfo.InApexVariantByBaseName(requiredApex) { } else if !apexInfo.InApexVariant(requiredApex) {
// An apex variant for a specific apex is required but this is the wrong apex. // An apex variant for a specific apex is required but this is the wrong apex.
return false return false
} }