aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2017-05-19 00:20:30 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-19 00:20:30 +0000
commit267afc85d47f341c31b48883be41d78551397877 (patch)
tree8cf9042487117347ac2f1b218013ab910d0523e0 /java
parentc0d03f79bd4085a83859d43b16295e4c8ce4233b (diff)
parente777c7bdc759d6b851f71dccd74fe8b06b9b4d00 (diff)
downloadlatinime-267afc85d47f341c31b48883be41d78551397877.tar.gz
latinime-267afc85d47f341c31b48883be41d78551397877.tar.xz
latinime-267afc85d47f341c31b48883be41d78551397877.zip
Merge "Revert "Revert "Use AAPT2""" into oc-dev am: e6cfc2ff63
am: e777c7bdc7 Change-Id: Ibf41dc758b32f4b4f0398c5013ad6d3899743f49
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