Robolectric: Use jarjar'ed icu4j-icu{tz,}data directly.
robolectric_android-all-stub was carrying jarjar rules, even
though those only affected the icu4j-{tz,}icudata parts of
the target.
This CL switches to the dependency to the already-jarjar'ed
icu4j-icu{tz,}data-jarjar targets, which is better isolated and
may be built with an earlier LOCAL_JAVA_LANGUAGE_VERSION.
Bug: 72703434
Test: Treehugger (after http://r.android.com/c/612671 )
Change-Id: I56649cd31687159f5035b89a98677bd8c1a6a169
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 \
