summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Thierer <tobiast@google.com>2018-02-09 10:53:24 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-09 10:53:24 +0000
commit5f381dd0071403faa3fd25afbe9c34b5443d68b3 (patch)
tree1fb7b04222c2805d57e0fbf95cae5eb6afcfb22c
parent2792f6b7da5f8b4471acb13665a2c8b0eac23f0e (diff)
parent095aeb50676cf2ba0a26e10a24799d6ca5b63930 (diff)
downloadicu-5f381dd0071403faa3fd25afbe9c34b5443d68b3.tar.gz
Introduce a jarjar'ed version of icu4j-icutzdata. am: 75041df950 am: f724c83144
am: 095aeb5067 Change-Id: I957e510f94b88d6c760a7ddb31163f148022c4e2
-rw-r--r--icu4j/Android.mk8
1 files changed, 8 insertions, 0 deletions
diff --git a/icu4j/Android.mk b/icu4j/Android.mk
index ec9d5a06f..79319894e 100644
--- a/icu4j/Android.mk
+++ b/icu4j/Android.mk
@@ -155,3 +155,11 @@ LOCAL_MODULE := icu4j-icutzdata-host-jarjar
# Pin java_version until jarjar is certified to support later versions. http://b/72703434
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
include $(BUILD_HOST_JAVA_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_STATIC_JAVA_LIBRARIES := icu4j-icutzdata
+LOCAL_JARJAR_RULES := $(LOCAL_PATH)/liblayout-jarjar-rules.txt
+LOCAL_MODULE := icu4j-icutzdata-jarjar
+# Pin java_version until jarjar is certified to support later versions. http://b/72703434
+LOCAL_JAVA_LANGUAGE_VERSION := 1.8
+include $(BUILD_STATIC_JAVA_LIBRARY)