diff options
author | 2025-02-12 21:54:11 -0800 | |
---|---|---|
committer | 2025-02-12 21:54:11 -0800 | |
commit | 4a80748e09ff307c3052fbb36ac38880fd5d2340 (patch) | |
tree | 4d421d8fcaea1914cf782421676fbb0da48af277 /java/aar_test.go | |
parent | c0a00df42e8f63caa3070c80a1e40db22bc574cc (diff) | |
parent | 90607e9056f6ff4cec2447fdd7a8b252d67ffde7 (diff) |
Merge "Don't panic in ModuleForTests and friends" into main
Diffstat (limited to 'java/aar_test.go')
-rw-r--r-- | java/aar_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/aar_test.go b/java/aar_test.go index 3ac228d35..088ad6c92 100644 --- a/java/aar_test.go +++ b/java/aar_test.go @@ -53,7 +53,7 @@ func TestAarImportProducesJniPackages(t *testing.T) { t.Run(tc.name, func(t *testing.T) { t.Parallel() appMod := ctx.Module(tc.name, "android_common") - appTestMod := ctx.ModuleForTests(tc.name, "android_common") + appTestMod := ctx.ModuleForTests(t, tc.name, "android_common") info, ok := android.OtherModuleProvider(ctx, appMod, JniPackageProvider) if !ok { @@ -117,7 +117,7 @@ func TestLibraryFlagsPackages(t *testing.T) { } `) - foo := result.ModuleForTests("foo", "android_common") + foo := result.ModuleForTests(t, "foo", "android_common") // android_library module depends on aconfig_declarations listed in flags_packages android.AssertBoolEquals(t, "foo expected to depend on bar", true, @@ -159,9 +159,9 @@ func TestAndroidLibraryOutputFilesRel(t *testing.T) { } `) - foo := result.ModuleForTests("foo", "android_common") - bar := result.ModuleForTests("bar", "android_common") - baz := result.ModuleForTests("baz", "android_common") + foo := result.ModuleForTests(t, "foo", "android_common") + bar := result.ModuleForTests(t, "bar", "android_common") + baz := result.ModuleForTests(t, "baz", "android_common") fooOutputPaths := foo.OutputFiles(result.TestContext, t, "") barOutputPaths := bar.OutputFiles(result.TestContext, t, "") |