diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-02-09 10:30:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-02-09 10:30:58 +0000 |
| commit | 18cb219ca73cf67e5cf3d29a820441fe330c226b (patch) | |
| tree | 6e321ed20ad0070ce76b6ca135e19161f269cf57 | |
| parent | 05cca96dee79833d2c2f24a38eb31a65c36ba727 (diff) | |
| parent | 1ee426932109f6123145d89c866aba6e8517bc61 (diff) | |
| download | robolectric-o-mr1-iot-preview-8.tar.gz | |
Merge "Robolectric: Use jarjar'ed icu4j-icu{tz,}data directly."android-wear-p-preview-2android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8o-mr1-iot-preview-7
| -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 \ |