Merge "Robolectric: Use jarjar'ed icu4j-icu{tz,}data directly."
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 \