diff options
| author | 2019-12-23 15:38:34 +0900 | |
|---|---|---|
| committer | 2019-12-23 06:46:39 +0000 | |
| commit | 5a80d9f352763c26f292def9c8e28656bde03cec (patch) | |
| tree | d0d389ae308d621f58acc41fdaf4f14a19693788 /apex/apex_test.go | |
| parent | 7e143af6ee16efad245922acd7baecbd980d2f98 (diff) | |
apex: drop `java_import` support
java_import doesn't support dex jar which is necessary to be packaged in
an APEX. Supporting this would require non-trivial work. By the way
java_import is not used and there is a workaround.(defining java_library
and static-linking with it)
We drop the support for `java_import` in APEX.
Bug: 139175488
Test: m (soong tests amended)
Change-Id: I924386571079090c701276d87f665ce7fbb6f074
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index 4236ca6ad..97600b6c5 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -372,7 +372,7 @@ func TestBasicApex(t *testing.T) { binaries: ["foo",], } }, - java_libs: ["myjar", "myprebuiltjar"], + java_libs: ["myjar"], } apex { @@ -447,12 +447,6 @@ func TestBasicApex(t *testing.T) { system_modules: "none", compile_dex: true, } - - java_import { - name: "myprebuiltjar", - jars: ["prebuilt.jar"], - installable: true, - } `) apexRule := ctx.ModuleForTests("myapex", "android_common_myapex_image").Rule("apexRule") @@ -470,7 +464,6 @@ func TestBasicApex(t *testing.T) { // Ensure that apex variant is created for the direct dep ensureListContains(t, ctx.ModuleVariantsForTests("mylib"), "android_arm64_armv8-a_shared_myapex") ensureListContains(t, ctx.ModuleVariantsForTests("myjar"), "android_common_myapex") - ensureListContains(t, ctx.ModuleVariantsForTests("myprebuiltjar"), "android_common_myapex") // Ensure that apex variant is created for the indirect dep ensureListContains(t, ctx.ModuleVariantsForTests("mylib2"), "android_arm64_armv8-a_shared_myapex") @@ -480,7 +473,6 @@ func TestBasicApex(t *testing.T) { ensureContains(t, copyCmds, "image.apex/lib64/mylib.so") ensureContains(t, copyCmds, "image.apex/lib64/mylib2.so") ensureContains(t, copyCmds, "image.apex/javalib/myjar.jar") - ensureContains(t, copyCmds, "image.apex/javalib/myprebuiltjar.jar") // .. but not for java libs ensureNotContains(t, copyCmds, "image.apex/javalib/myotherjar.jar") @@ -489,7 +481,6 @@ func TestBasicApex(t *testing.T) { ensureListContains(t, ctx.ModuleVariantsForTests("mylib2"), "android_arm64_armv8-a_shared") ensureListContains(t, ctx.ModuleVariantsForTests("myjar"), "android_common") ensureListContains(t, ctx.ModuleVariantsForTests("myotherjar"), "android_common") - ensureListContains(t, ctx.ModuleVariantsForTests("myprebuiltjar"), "android_common") // Ensure that all symlinks are present. found_foo_link_64 := false |