diff options
| author | 2024-07-09 21:28:55 +0000 | |
|---|---|---|
| committer | 2024-07-09 21:28:55 +0000 | |
| commit | 8dfc2bf163a306a2256798b86c3df91ca6880a8b (patch) | |
| tree | 7dab3f7696a8729a522efa095ae164b2f0ec2dad /java/java_test.go | |
| parent | e020ba9ce0d4bc02598f67d431388204b7734711 (diff) | |
| parent | 68786d81deae3419359cbebdfea23d9fc724637c (diff) | |
Merge "Use OutputFilesProvider on Import, AARImport and AndroidAppImport" into main
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/java/java_test.go b/java/java_test.go index 2f2793202..51c969e77 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -2994,22 +2994,22 @@ func TestJavaLibraryOutputFilesRel(t *testing.T) { baz := result.ModuleForTests("baz", "android_common") fooOutputPath := android.OutputFileForModule(android.PathContext(nil), foo.Module(), "") - barOutputPath := android.OutputFileForModule(android.PathContext(nil), bar.Module(), "") - bazOutputPath := android.OutputFileForModule(android.PathContext(nil), baz.Module(), "") + 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.AssertPathRelativeToTopEquals(t, "bar output path", - "out/soong/.intermediates/bar/android_common/combined/bar.jar", barOutputPath) - android.AssertPathRelativeToTopEquals(t, "baz output path", - "out/soong/.intermediates/baz/android_common/combined/baz.jar", bazOutputPath) + 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()) android.AssertStringEquals(t, "bar relative output path", - "bar.jar", barOutputPath.Rel()) + "bar.jar", barOutputPaths[0].Rel()) android.AssertStringEquals(t, "baz relative output path", - "baz.jar", bazOutputPath.Rel()) + "baz.jar", bazOutputPaths[0].Rel()) } func assertTestOnlyAndTopLevel(t *testing.T, ctx *android.TestResult, expectedTestOnly []string, expectedTopLevel []string) { |