diff options
| author | Tobias Thierer <tobiast@google.com> | 2018-01-09 20:49:40 +0000 |
|---|---|---|
| committer | Tobias Thierer <tobiast@google.com> | 2018-01-19 16:46:12 +0000 |
| commit | a6505634ec0fffc61ee1915db54b467f61b6738d (patch) | |
| tree | c887e2bc39619d8d5c48b2601692eca70f07c301 | |
| parent | ee29aba6860f1c7f0a31a714c9d6e3e5ac1171cd (diff) | |
| download | icu-a6505634ec0fffc61ee1915db54b467f61b6738d.tar.gz | |
Fix android-icu4j-tests compilation for javac -target 1.9android-wear-8.0.0_r1
This make target includes ojluni/src/test/java/util/stream/{bootlib,boottest}
tests that are in libcore packages; this fails when compiling with a
javac that implements the module system (such as when
EXPERIMENTAL_USE_OPENJDK9=true).
After this CL, --patch-module=java.base=[...] is used to patch this
target's sources and classpath .jars into java.base at compile time.
No run-time change is currently needed because these tests are run
on the device (dalvikvm), which currently doesn't implement the
OpenJDK 9 module system.
Bug: 71699916
Test: CtsIcuTestCases
Change-Id: Id486046eb388c61fa0db5b174de31f6bcaac13bc
| -rw-r--r-- | android_icu4j/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/android_icu4j/Android.mk b/android_icu4j/Android.mk index 42a50cc60..605f3eff6 100644 --- a/android_icu4j/Android.mk +++ b/android_icu4j/Android.mk @@ -46,6 +46,7 @@ LOCAL_JAVA_LIBRARIES := \ core-oj \ core-libart LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_PATCH_MODULE := java.base LOCAL_MODULE := android-icu4j-tests include $(BUILD_STATIC_JAVA_LIBRARY) |