diff options
| author |   Alan Viverette <alanv@google.com> | 2017-05-16 02:17:48 +0000 |
|---|---|---|
| committer |   android-build-merger <android-build-merger@google.com> | 2017-05-16 02:17:48 +0000 |
| commit | adafcbe7a992928cd372336e9ca232311e33ddca (patch) | |
| tree | dbb5188f7ce996ffb2b1306d61074a3eca7ef18b /java | |
| parent | c50b698341a43a30d3135ca4593911ff26c93534 (diff) | |
| parent | 811b5295dfca2d96d296866f9f42b86afa8a513e (diff) | |
| download | latinime-adafcbe7a992928cd372336e9ca232311e33ddca.tar.gz latinime-adafcbe7a992928cd372336e9ca232311e33ddca.tar.xz latinime-adafcbe7a992928cd372336e9ca232311e33ddca.zip | |
Merge "Revert "Use AAPT2"" into oc-dev am: 3ac57504cd
am: 811b5295df
Change-Id: Ifbf1782b7c55f7414b29215711c9cb08b69dd256
Diffstat (limited to 'java')
| -rw-r--r-- | java/Android.mk | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/java/Android.mk b/java/Android.mk index 154f3a20c..b84b3471e 100644 --- a/java/Android.mk +++ b/java/Android.mk @@ -26,12 +26,7 @@ LOCAL_CERTIFICATE := shared LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime LOCAL_STATIC_JAVA_LIBRARIES := \ - android-common inputmethod-common jsr305 latinime-common - -LOCAL_STATIC_ANDROID_LIBRARIES := \ - android-support-v4 - -LOCAL_USE_AAPT2 := true + android-common inputmethod-common android-support-v4 jsr305 latinime-common # Do not compress dictionary files to mmap dict data runtime LOCAL_AAPT_FLAGS := -0 .dict |