commit 18cb219ca73cf67e5cf3d29a820441fe330c226b
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 09 10:30:58 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 09 10:30:58 2018 +0000
tree 6e321ed20ad0070ce76b6ca135e19161f269cf57
parent 05cca96dee79833d2c2f24a38eb31a65c36ba727
parent 1ee426932109f6123145d89c866aba6e8517bc61

Merge "Robolectric: Use jarjar'ed icu4j-icu{tz,}data directly."

Android.mk

diff --git a/Android.mk b/Android.mk
index e10a3f5..352b94a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,16 +18,13 @@
 LOCAL_MODULE := robolectric_android-all
 LOCAL_JACK_ENABLED := disabled
 
-# Re-package icudata under android.icu.**.
-LOCAL_JARJAR_RULES := external/icu/icu4j/liblayout-jarjar-rules.txt
-
 LOCAL_STATIC_JAVA_LIBRARIES := \
     conscrypt \
     core-libart \
     ext \
     framework \
-    icu4j-icudata \
-    icu4j-icutzdata \
+    icu4j-icudata-jarjar \
+    icu4j-icutzdata-jarjar \
     ims-common \
     legacy-test \
     libphonenumber-platform \