diff options
Diffstat (limited to 'java/aar_test.go')
| -rw-r--r-- | java/aar_test.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/java/aar_test.go b/java/aar_test.go index 3361bf929..d6dbe3c25 100644 --- a/java/aar_test.go +++ b/java/aar_test.go @@ -136,18 +136,19 @@ func TestAndroidLibraryOutputFilesRel(t *testing.T) { android_library { name: "foo", srcs: ["a.java"], + java_resources: ["foo.txt"], } android_library_import { name: "bar", - aars: ["bar.aar"], + aars: ["bar_prebuilt.aar"], } android_library_import { name: "baz", - aars: ["baz.aar"], - static_libs: ["bar"], + aars: ["baz_prebuilt.aar"], + static_libs: ["foo", "bar"], } `) @@ -160,11 +161,11 @@ func TestAndroidLibraryOutputFilesRel(t *testing.T) { bazOutputPath := android.OutputFileForModule(android.PathContext(nil), baz.Module(), "") android.AssertPathRelativeToTopEquals(t, "foo output path", - "out/soong/.intermediates/foo/android_common/javac/foo.jar", fooOutputPath) + "out/soong/.intermediates/foo/android_common/withres/foo.jar", fooOutputPath) android.AssertPathRelativeToTopEquals(t, "bar output path", "out/soong/.intermediates/bar/android_common/aar/bar.jar", barOutputPath) android.AssertPathRelativeToTopEquals(t, "baz output path", - "out/soong/.intermediates/baz/android_common/combined/baz.jar", bazOutputPath) + "out/soong/.intermediates/baz/android_common/withres/baz.jar", bazOutputPath) android.AssertStringEquals(t, "foo relative output path", "foo.jar", fooOutputPath.Rel()) |