From 663e4508dc4fe228696ede997d5fca24e4c1431e Mon Sep 17 00:00:00 2001 From: Yu Liu Date: Mon, 12 Aug 2024 18:23:59 +0000 Subject: Merge SingletonProviderContext with OtherModuleProviderContext Bug: 358425833 Test: CI Change-Id: I8e3f40dc3cfc5337008b419801f8e6bf2d48e8b2 --- java/testing.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/testing.go') 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 { -- cgit v1.2.3-59-g8ed1b