aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2017-05-02 13:39:22 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-02 13:39:22 +0000
commitc53f1fbe95c9f5db306137711a5d013e6268d5b4 (patch)
treee04b7b8fc384cd7f3bfd4d817c9e69660010436b /java
parent9ec6cef05cddbe12d40fda105a172bf3488c78f9 (diff)
parenta9d9daebd22f2f470bb7d0480bc56541df5e3df1 (diff)
downloadlatinime-c53f1fbe95c9f5db306137711a5d013e6268d5b4.tar.gz
latinime-c53f1fbe95c9f5db306137711a5d013e6268d5b4.tar.xz
latinime-c53f1fbe95c9f5db306137711a5d013e6268d5b4.zip
Merge "Use AAPT2" into oc-dev
am: a9d9daebd2 Change-Id: I1c3cf78d426e298d81d1d255c315d4ed95b15afb
Diffstat (limited to 'java')
-rw-r--r--java/Android.mk7
1 files changed, 6 insertions, 1 deletions
diff --git a/java/Android.mk b/java/Android.mk
index b84b3471e..154f3a20c 100644
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -26,7 +26,12 @@ LOCAL_CERTIFICATE := shared
LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime
LOCAL_STATIC_JAVA_LIBRARIES := \
- android-common inputmethod-common android-support-v4 jsr305 latinime-common
+ android-common inputmethod-common jsr305 latinime-common
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ android-support-v4
+
+LOCAL_USE_AAPT2 := true
# Do not compress dictionary files to mmap dict data runtime
LOCAL_AAPT_FLAGS := -0 .dict