From 663e4508dc4fe228696ede997d5fca24e4c1431e Mon Sep 17 00:00:00 2001
From: Yu Liu <yudiliu@google.com>
Date: Mon, 12 Aug 2024 18:23:59 +0000
Subject: Merge SingletonProviderContext with OtherModuleProviderContext

Bug: 358425833
Test: CI
Change-Id: I8e3f40dc3cfc5337008b419801f8e6bf2d48e8b2
---
 java/sdk.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java/sdk.go')

diff --git a/java/sdk.go b/java/sdk.go
index 4ef4ee251..dd198ac57 100644
--- a/java/sdk.go
+++ b/java/sdk.go
@@ -278,7 +278,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 j, ok := android.SingletonModuleProvider(ctx, module, JavaInfoProvider); ok {
+		if j, ok := android.OtherModuleProvider(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