diff options
| author | 2024-07-11 01:24:10 +0000 | |
|---|---|---|
| committer | 2024-07-11 01:24:10 +0000 | |
| commit | 256772f02c96cedbad1d1d135f55f48b33bf9afc (patch) | |
| tree | ad8cf69cd4817730cc2ffe72b25ee8091c50d3bc /java/aar_test.go | |
| parent | 05f3927c090e32ab2ff4260f1e2d847dfef13a9a (diff) | |
| parent | 9f7b9f4a9ab77d1816e8ae30ac8339e335fb7e92 (diff) | |
Merge "Use OutputFilesProvider on java modules" into main
Diffstat (limited to 'java/aar_test.go')
| -rw-r--r-- | java/aar_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/aar_test.go b/java/aar_test.go index 1ab1f9c90..ebad310ab 100644 --- a/java/aar_test.go +++ b/java/aar_test.go @@ -159,19 +159,19 @@ func TestAndroidLibraryOutputFilesRel(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/withres/foo.jar", fooOutputPath) + android.AssertPathsRelativeToTopEquals(t, "foo output path", + []string{"out/soong/.intermediates/foo/android_common/withres/foo.jar"}, fooOutputPaths) android.AssertPathsRelativeToTopEquals(t, "bar output path", []string{"out/soong/.intermediates/bar/android_common/aar/bar.jar"}, barOutputPaths) android.AssertPathsRelativeToTopEquals(t, "baz output path", []string{"out/soong/.intermediates/baz/android_common/withres/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", |