Merge "Remove usage of OtherModuleHasProvider in dexpreopt_bootjars" into main
This commit is contained in:
@@ -552,8 +552,8 @@ func DexpreoptBootJarsMutator(ctx android.BottomUpMutatorContext) {
|
|||||||
func addDependenciesOntoSelectedBootImageApexes(ctx android.BottomUpMutatorContext, apexes ...string) {
|
func addDependenciesOntoSelectedBootImageApexes(ctx android.BottomUpMutatorContext, apexes ...string) {
|
||||||
psi := android.PrebuiltSelectionInfoMap{}
|
psi := android.PrebuiltSelectionInfoMap{}
|
||||||
ctx.VisitDirectDepsWithTag(apexContributionsMetadataDepTag, func(am android.Module) {
|
ctx.VisitDirectDepsWithTag(apexContributionsMetadataDepTag, func(am android.Module) {
|
||||||
if ctx.OtherModuleHasProvider(am, android.PrebuiltSelectionInfoProvider) {
|
if info, exists := android.OtherModuleProvider(ctx, am, android.PrebuiltSelectionInfoProvider); exists {
|
||||||
psi = ctx.OtherModuleProvider(am, android.PrebuiltSelectionInfoProvider).(android.PrebuiltSelectionInfoMap)
|
psi = info
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
for _, apex := range apexes {
|
for _, apex := range apexes {
|
||||||
|
Reference in New Issue
Block a user