Merge "Remove usage of OtherModuleHasProvider in dexpreopt_bootjars" into main am: 71790b154d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2883015 Change-Id: I6039556d4ebc8e93bc79f85aec0ddf9c296de04d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -552,8 +552,8 @@ func DexpreoptBootJarsMutator(ctx android.BottomUpMutatorContext) {
|
||||
func addDependenciesOntoSelectedBootImageApexes(ctx android.BottomUpMutatorContext, apexes ...string) {
|
||||
psi := android.PrebuiltSelectionInfoMap{}
|
||||
ctx.VisitDirectDepsWithTag(apexContributionsMetadataDepTag, func(am android.Module) {
|
||||
if ctx.OtherModuleHasProvider(am, android.PrebuiltSelectionInfoProvider) {
|
||||
psi = ctx.OtherModuleProvider(am, android.PrebuiltSelectionInfoProvider).(android.PrebuiltSelectionInfoMap)
|
||||
if info, exists := android.OtherModuleProvider(ctx, am, android.PrebuiltSelectionInfoProvider); exists {
|
||||
psi = info
|
||||
}
|
||||
})
|
||||
for _, apex := range apexes {
|
||||
|
Reference in New Issue
Block a user