diff options
| author | 2025-02-12 21:54:11 -0800 | |
|---|---|---|
| committer | 2025-02-12 21:54:11 -0800 | |
| commit | 4a80748e09ff307c3052fbb36ac38880fd5d2340 (patch) | |
| tree | 4d421d8fcaea1914cf782421676fbb0da48af277 /java/sdk_test.go | |
| parent | c0a00df42e8f63caa3070c80a1e40db22bc574cc (diff) | |
| parent | 90607e9056f6ff4cec2447fdd7a8b252d67ffde7 (diff) | |
Merge "Don't panic in ModuleForTests and friends" into main
Diffstat (limited to 'java/sdk_test.go')
| -rw-r--r-- | java/sdk_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/sdk_test.go b/java/sdk_test.go index e926307fb..49983ada2 100644 --- a/java/sdk_test.go +++ b/java/sdk_test.go @@ -501,7 +501,7 @@ func testClasspathTestCases(t *testing.T, classpathTestcases []classpathTestCase } checkClasspath := func(t *testing.T, result *android.TestResult, isJava8 bool) { - foo := result.ModuleForTests("foo", variant(result)) + foo := result.ModuleForTests(t, "foo", variant(result)) javac := foo.Rule("javac") var deps []string @@ -579,7 +579,7 @@ func testClasspathTestCases(t *testing.T, classpathTestcases []classpathTestCase checkClasspath(t, result, true /* isJava8 */) if testcase.host != android.Host { - aidl := result.ModuleForTests("foo", variant(result)).Rule("aidl") + aidl := result.ModuleForTests(t, "foo", variant(result)).Rule("aidl") android.AssertStringDoesContain(t, "aidl command", aidl.RuleParams.Command, testcase.aidl+" -I.") } @@ -593,7 +593,7 @@ func testClasspathTestCases(t *testing.T, classpathTestcases []classpathTestCase checkClasspath(t, result, false /* isJava8 */) if testcase.host != android.Host { - aidl := result.ModuleForTests("foo", variant(result)).Rule("aidl") + aidl := result.ModuleForTests(t, "foo", variant(result)).Rule("aidl") android.AssertStringDoesContain(t, "aidl command", aidl.RuleParams.Command, testcase.aidl+" -I.") } |