diff options
| author | 2024-08-13 16:15:51 +0000 | |
|---|---|---|
| committer | 2024-08-13 16:15:51 +0000 | |
| commit | 73282e8129f0bae5bb8c2a56520c7d8b2bc310a2 (patch) | |
| tree | f87caec4abbe7a7180b0cfa078d616c1cfa4c673 /java/testing.go | |
| parent | 4081f58abb2e946147aada9218b432642812aa5c (diff) | |
| parent | 246b43049c88572de399648718f70a28d3b245ba (diff) | |
Merge "Merge SingletonProviderContext with OtherModuleProviderContext" into main am: 246b43049c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216676
Change-Id: Ib0d8eb66616fa4775e3827b4956ad19034bf1cc8
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.go | 4 |
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 { |