commit 71790b154d846516a2c37f921a75f7d641c034ce
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Dec 21 21:58:53 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 21 21:58:53 2023 +0000
tree c3551d6dadf977856eb5f939dc3f3f5db46bbc01
parent aa5d9b43f95796177a78910e3c4438a72c83769c
parent bc114d2ff943350d179ff679c770bc9625d70650

Merge "Remove usage of OtherModuleHasProvider in dexpreopt_bootjars" into main

java/dexpreopt_bootjars.go

diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go
index 205d3b9..73609bf 100644
--- a/java/dexpreopt_bootjars.go
+++ b/java/dexpreopt_bootjars.go
@@ -552,8 +552,8 @@
 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 {