diff options
| author | Tobias Thierer <tobiast@google.com> | 2018-02-09 10:53:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-09 10:53:29 +0000 |
| commit | 37cc417f94cf66eee8bb96c722cb528c073298bc (patch) | |
| tree | 841f1ec8ab804dc05504bba2f079da9b02a34a4a | |
| parent | 829a824cccbf1917fe38bfb1e5c9eaa99b508e50 (diff) | |
| parent | 8c178510c0200a706c0b9ea5d6d377ff994a8d53 (diff) | |
| download | robolectric-37cc417f94cf66eee8bb96c722cb528c073298bc.tar.gz | |
Merge "Robolectric: Use jarjar'ed icu4j-icu{tz,}data directly." am: 18cb219ca7 am: 806b50f604
am: 8c178510c0
Change-Id: I88a5732a325f5ea318bcf3cbb239336aa9ec8728
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index 664fe2e55..cb86d2e85 100644 --- a/Android.mk +++ b/Android.mk @@ -19,16 +19,13 @@ include $(CLEAR_VARS) LOCAL_MODULE := robolectric_android-all-stub -# 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 \ android.test.base \ libphonenumber-platform \ |