diff options
| author | Tobias Thierer <tobiast@google.com> | 2018-02-07 15:20:44 +0000 |
|---|---|---|
| committer | Tobias Thierer <tobiast@google.com> | 2018-02-08 15:25:47 +0000 |
| commit | 1ee426932109f6123145d89c866aba6e8517bc61 (patch) | |
| tree | 6e321ed20ad0070ce76b6ca135e19161f269cf57 | |
| parent | 05cca96dee79833d2c2f24a38eb31a65c36ba727 (diff) | |
| download | robolectric-1ee426932109f6123145d89c866aba6e8517bc61.tar.gz | |
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
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index e10a3f5f9..352b94a60 100644 --- a/Android.mk +++ b/Android.mk @@ -18,16 +18,13 @@ include $(CLEAR_VARS) 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 \ |