diff options
Diffstat (limited to 'java')
-rw-r--r-- | java/aar_test.go | 6 | ||||
-rw-r--r-- | java/app_test.go | 2 | ||||
-rw-r--r-- | java/droiddoc_test.go | 2 | ||||
-rw-r--r-- | java/java_test.go | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/java/aar_test.go b/java/aar_test.go index 877e2c7d6..aa4f0af10 100644 --- a/java/aar_test.go +++ b/java/aar_test.go @@ -159,9 +159,9 @@ func TestAndroidLibraryOutputFilesRel(t *testing.T) { bar := result.ModuleForTests("bar", "android_common") baz := result.ModuleForTests("baz", "android_common") - fooOutputPaths := foo.OutputFiles(t, "") - barOutputPaths := bar.OutputFiles(t, "") - bazOutputPaths := baz.OutputFiles(t, "") + fooOutputPaths := foo.OutputFiles(result.TestContext, t, "") + barOutputPaths := bar.OutputFiles(result.TestContext, t, "") + bazOutputPaths := baz.OutputFiles(result.TestContext, t, "") android.AssertPathsRelativeToTopEquals(t, "foo output path", []string{"out/soong/.intermediates/foo/android_common/withres/foo.jar"}, fooOutputPaths) diff --git a/java/app_test.go b/java/app_test.go index 6b7d522f3..ec97a553f 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -119,7 +119,7 @@ func TestAppSplits(t *testing.T) { foo.Output(expectedOutput) } - outputFiles := foo.OutputFiles(t, "") + outputFiles := foo.OutputFiles(ctx, t, "") android.AssertPathsRelativeToTopEquals(t, `OutputFiles("")`, expectedOutputs, outputFiles) } diff --git a/java/droiddoc_test.go b/java/droiddoc_test.go index e5846407f..9e1ebbed0 100644 --- a/java/droiddoc_test.go +++ b/java/droiddoc_test.go @@ -69,7 +69,7 @@ func TestDroiddoc(t *testing.T) { "bar-doc/a.java": nil, "bar-doc/b.java": nil, }) - barStubsOutputs := ctx.ModuleForTests("bar-stubs", "android_common").OutputFiles(t, "") + barStubsOutputs := ctx.ModuleForTests("bar-stubs", "android_common").OutputFiles(ctx, t, "") if len(barStubsOutputs) != 1 { t.Errorf("Expected one output from \"bar-stubs\" got %s", barStubsOutputs) } diff --git a/java/java_test.go b/java/java_test.go index 477a0b385..9e39b51aa 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -2919,9 +2919,9 @@ func TestJavaLibraryOutputFilesRel(t *testing.T) { bar := result.ModuleForTests("bar", "android_common") baz := result.ModuleForTests("baz", "android_common") - fooOutputPaths := foo.OutputFiles(t, "") - barOutputPaths := bar.OutputFiles(t, "") - bazOutputPaths := baz.OutputFiles(t, "") + fooOutputPaths := foo.OutputFiles(result.TestContext, t, "") + barOutputPaths := bar.OutputFiles(result.TestContext, t, "") + bazOutputPaths := baz.OutputFiles(result.TestContext, t, "") android.AssertPathsRelativeToTopEquals(t, "foo output path", []string{"out/soong/.intermediates/foo/android_common/javac/foo.jar"}, fooOutputPaths) |