diff options
| author | 2024-07-09 10:41:55 -0700 | |
|---|---|---|
| committer | 2024-07-09 10:41:55 -0700 | |
| commit | 68786d81deae3419359cbebdfea23d9fc724637c (patch) | |
| tree | efde6ad4e8595947abd2860f798f360f7de8ae38 /java/java_test.go | |
| parent | ad111586a760e1033cef000da27de1be88c96df3 (diff) | |
Use OutputFilesProvider on Import, AARImport and AndroidAppImport
In the context of incremental soong, the output files
inter-module-communication will be through OutputFilesProvider.
The OutputFileProducer interface will be deprecated.
Test: CI
Bug: 339477385
Change-Id: I51ccf59f97cb8a790642cb4463c479feaf18058a
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) { |