From 5a37718c956b1bfbda5e236c0fe50f08661a81de Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Thu, 14 Dec 2023 14:46:23 -0800
Subject: Convert ModuleProvder to generic providers API

Convert all of the callers of ModuleProvider/ModuleHasProvider to use the
type-safe android.SingletonModuleProvider API.

Bug: 316410648
Test: builds
Change-Id: I6f11638546b64749e451cebbf33140248dc1d193
---
 java/sdk.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'java/sdk.go')

diff --git a/java/sdk.go b/java/sdk.go
index ad71fb236..352b24319 100644
--- a/java/sdk.go
+++ b/java/sdk.go
@@ -262,8 +262,7 @@ func createFrameworkAidl(stubsModules []string, path android.WritablePath, ctx a
 
 	ctx.VisitAllModules(func(module android.Module) {
 		// Collect dex jar paths for the modules listed above.
-		if ctx.ModuleHasProvider(module, JavaInfoProvider) {
-			j := ctx.ModuleProvider(module, JavaInfoProvider).(JavaInfo)
+		if j, ok := android.SingletonModuleProvider(ctx, module, JavaInfoProvider); ok {
 			name := ctx.ModuleName(module)
 			if i := android.IndexList(name, stubsModules); i != -1 {
 				stubsJars[i] = j.HeaderJars
-- 
cgit v1.2.3-59-g8ed1b