summaryrefslogtreecommitdiff
path: root/java/testing.go
diff options
context:
space:
mode:
author Yu Liu <yudiliu@google.com> 2024-08-12 18:23:59 +0000
committer Yu Liu <yudiliu@google.com> 2024-08-12 22:50:19 +0000
commit663e4508dc4fe228696ede997d5fca24e4c1431e (patch)
tree9b7af2c4054009b226b492484224bc598f4d7ae8 /java/testing.go
parent703c2e3d64aff7950a8485a2c46fe15b0f91d89e (diff)
Merge SingletonProviderContext with OtherModuleProviderContext
Bug: 358425833 Test: CI Change-Id: I8e3f40dc3cfc5337008b419801f8e6bf2d48e8b2
Diffstat (limited to 'java/testing.go')
-rw-r--r--java/testing.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/testing.go b/java/testing.go
index a99baf8a2..e1bf5376e 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -632,7 +632,7 @@ func CheckPlatformBootclasspathModules(t *testing.T, result *android.TestResult,
func CheckClasspathFragmentProtoContentInfoProvider(t *testing.T, result *android.TestResult, generated bool, contents, outputFilename, installDir string) {
t.Helper()
p := result.Module("platform-bootclasspath", "android_common").(*platformBootclasspathModule)
- info, _ := android.SingletonModuleProvider(result, p, ClasspathFragmentProtoContentInfoProvider)
+ info, _ := android.OtherModuleProvider(result, p, ClasspathFragmentProtoContentInfoProvider)
android.AssertBoolEquals(t, "classpath proto generated", generated, info.ClasspathFragmentProtoGenerated)
android.AssertStringEquals(t, "classpath proto contents", contents, info.ClasspathFragmentProtoContents.String())
@@ -652,7 +652,7 @@ func ApexNamePairsFromModules(ctx *android.TestContext, modules []android.Module
func apexNamePairFromModule(ctx *android.TestContext, module android.Module) string {
name := module.Name()
var apex string
- apexInfo, _ := android.SingletonModuleProvider(ctx, module, android.ApexInfoProvider)
+ apexInfo, _ := android.OtherModuleProvider(ctx, module, android.ApexInfoProvider)
if apexInfo.IsForPlatform() {
apex = "platform"
} else {