diff options
| author |   Alan Viverette <alanv@google.com> | 2017-05-16 01:09:31 +0000 |
|---|---|---|
| committer |   android-build-merger <android-build-merger@google.com> | 2017-05-16 01:09:31 +0000 |
| commit | 811b5295dfca2d96d296866f9f42b86afa8a513e (patch) | |
| tree | 1a93f880ebfceb669aaa7c42501eb0019fd42e92 /java | |
| parent | 28f867d7800eca27ac6abb0d453de73b1039b4d8 (diff) | |
| parent | 3ac57504cd087083865cb47fd0c295ebd6caf747 (diff) | |
| download | latinime-811b5295dfca2d96d296866f9f42b86afa8a513e.tar.gz latinime-811b5295dfca2d96d296866f9f42b86afa8a513e.tar.xz latinime-811b5295dfca2d96d296866f9f42b86afa8a513e.zip | |
Merge "Revert "Use AAPT2"" into oc-dev
am: 3ac57504cd
Change-Id: I45cb9a9ecfe5d273a2bfd56463c7a7ada868bf67
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 |