diff options
| author | Tobias Thierer <tobiast@google.com> | 2018-02-09 10:47:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-09 10:47:53 +0000 |
| commit | 8c178510c0200a706c0b9ea5d6d377ff994a8d53 (patch) | |
| tree | 4409d073ec260080adbed613ea19d4837db5a832 | |
| parent | fbfdc725dedecdeeddd1b9803a5f4342d4f7b853 (diff) | |
| parent | 806b50f604a816f9b7a972397005edcdff89b000 (diff) | |
| download | robolectric-8c178510c0200a706c0b9ea5d6d377ff994a8d53.tar.gz | |
Merge "Robolectric: Use jarjar'ed icu4j-icu{tz,}data directly." am: 18cb219ca7
am: 806b50f604
Change-Id: I32e0d08632b8e2e5e9634073f26468e9884f8831
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index 7e565ef98..c649138c7 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 \ legacy-test \ libphonenumber-platform \ |