aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2017-05-02 16:02:31 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-02 16:02:31 +0000
commit507a88f478f031878bee9e6c6720a54389a9134d (patch)
treea26a018a42c7c9e420b1281defc6a5cdfd079516 /java
parent3c7155e15664f1ff887cb1dd13e846d6c829bc85 (diff)
parentc53f1fbe95c9f5db306137711a5d013e6268d5b4 (diff)
downloadlatinime-507a88f478f031878bee9e6c6720a54389a9134d.tar.gz
latinime-507a88f478f031878bee9e6c6720a54389a9134d.tar.xz
latinime-507a88f478f031878bee9e6c6720a54389a9134d.zip
Merge "Use AAPT2" into oc-dev am: a9d9daebd2
am: c53f1fbe95 Change-Id: I48d7964e30bb688f66e4295004c03738eef28d6e
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