summaryrefslogtreecommitdiff
path: root/java/bootclasspath_fragment_test.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2025-02-12 22:16:51 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-02-12 22:16:51 -0800
commit8ea2abcb0ff0f2e23391dbde621d62c0980138e7 (patch)
tree4d421d8fcaea1914cf782421676fbb0da48af277 /java/bootclasspath_fragment_test.go
parent421ced81177c558d9b03c958cc78493874e27a25 (diff)
parent4a80748e09ff307c3052fbb36ac38880fd5d2340 (diff)
Merge "Don't panic in ModuleForTests and friends" into main am: 4a80748e09
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3490133 Change-Id: I2057f531f5d40d61410ce97547d04b6840c4e800 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/bootclasspath_fragment_test.go')
-rw-r--r--java/bootclasspath_fragment_test.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/bootclasspath_fragment_test.go b/java/bootclasspath_fragment_test.go
index d181ce060..87b853c56 100644
--- a/java/bootclasspath_fragment_test.go
+++ b/java/bootclasspath_fragment_test.go
@@ -371,7 +371,7 @@ func TestFromTextWidestApiScope(t *testing.T) {
}
`)
- fragment := result.ModuleForTests("myfragment", "android_common")
+ fragment := result.ModuleForTests(t, "myfragment", "android_common")
dependencyStubDexFlag := "--dependency-stub-dex=out/soong/.intermediates/default/java/android-non-updatable.stubs.test_module_lib/android_common/dex/android-non-updatable.stubs.test_module_lib.jar"
stubFlagsCommand := fragment.Output("modular-hiddenapi/stub-flags.csv").RuleParams.Command
android.AssertStringDoesContain(t,
@@ -479,7 +479,7 @@ func TestSnapshotWithBootclasspathFragment_HiddenAPI(t *testing.T) {
// Make sure that the signature-patterns.csv is passed all the appropriate package properties
// from the bootclasspath_fragment and its contents.
- fragment := result.ModuleForTests("mybootclasspathfragment", "android_common")
+ fragment := result.ModuleForTests(t, "mybootclasspathfragment", "android_common")
rule := fragment.Output("modular-hiddenapi/signature-patterns.csv")
expectedCommand := strings.Join([]string{
"--split-package newlibrary",