commit 663e4508dc4fe228696ede997d5fca24e4c1431e
author Yu Liu <yudiliu@google.com> Mon Aug 12 18:23:59 2024 +0000
committer Yu Liu <yudiliu@google.com> Mon Aug 12 22:50:19 2024 +0000
tree 9b7af2c4054009b226b492484224bc598f4d7ae8
parent 703c2e3d64aff7950a8485a2c46fe15b0f91d89e

Merge SingletonProviderContext with OtherModuleProviderContext

Bug: 358425833
Test: CI
Change-Id: I8e3f40dc3cfc5337008b419801f8e6bf2d48e8b2

java/jdeps.go

diff --git a/java/jdeps.go b/java/jdeps.go
index 3400263..e856b37 100644
--- a/java/jdeps.go
+++ b/java/jdeps.go
@@ -89,7 +89,7 @@
 			dpInfo.Classes = append(dpInfo.Classes, data.Class)
 		}
 
-		if dep, ok := android.SingletonModuleProvider(ctx, module, JavaInfoProvider); ok {
+		if dep, ok := android.OtherModuleProvider(ctx, module, JavaInfoProvider); ok {
 			dpInfo.Installed_paths = append(dpInfo.Installed_paths, dep.ImplementationJars.Strings()...)
 		}
 		dpInfo.Classes = android.FirstUniqueStrings(dpInfo.Classes)