diff options
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/java_test.go b/java/java_test.go index 51c969e77..33079f381 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -2993,19 +2993,19 @@ func TestJavaLibraryOutputFilesRel(t *testing.T) { bar := result.ModuleForTests("bar", "android_common") baz := result.ModuleForTests("baz", "android_common") - fooOutputPath := android.OutputFileForModule(android.PathContext(nil), foo.Module(), "") + fooOutputPaths := foo.OutputFiles(t, "") barOutputPaths := bar.OutputFiles(t, "") bazOutputPaths := baz.OutputFiles(t, "") - android.AssertPathRelativeToTopEquals(t, "foo output path", - "out/soong/.intermediates/foo/android_common/javac/foo.jar", fooOutputPath) + android.AssertPathsRelativeToTopEquals(t, "foo output path", + []string{"out/soong/.intermediates/foo/android_common/javac/foo.jar"}, fooOutputPaths) android.AssertPathsRelativeToTopEquals(t, "bar output path", []string{"out/soong/.intermediates/bar/android_common/combined/bar.jar"}, barOutputPaths) android.AssertPathsRelativeToTopEquals(t, "baz output path", []string{"out/soong/.intermediates/baz/android_common/combined/baz.jar"}, bazOutputPaths) android.AssertStringEquals(t, "foo relative output path", - "foo.jar", fooOutputPath.Rel()) + "foo.jar", fooOutputPaths[0].Rel()) android.AssertStringEquals(t, "bar relative output path", "bar.jar", barOutputPaths[0].Rel()) android.AssertStringEquals(t, "baz relative output path", |