summaryrefslogtreecommitdiff
path: root/java/testing.go
diff options
context:
space:
mode:
author Yu Liu <yudiliu@google.com> 2024-08-13 16:38:05 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-08-13 16:38:05 +0000
commitac93739762c2a40dbc5b224d06abccf70fec70dc (patch)
treee67af30a8f8b64b6fb52c23234e7a72c6e90e018 /java/testing.go
parentc0911c59716dd0395f8e45130c44f6a668205b6a (diff)
parent73282e8129f0bae5bb8c2a56520c7d8b2bc310a2 (diff)
Merge "Merge SingletonProviderContext with OtherModuleProviderContext" into main am: 246b43049c am: 73282e8129
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216676 Change-Id: Ic5fa82e4179f922e35479e527a392db141a973c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 8158bb0a1..7a852771f 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -633,7 +633,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())
@@ -653,7 +653,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 {