aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2017-05-19 00:12:43 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-19 00:12:43 +0000
commite777c7bdc759d6b851f71dccd74fe8b06b9b4d00 (patch)
tree91cba01bb247711b05e524e38fb9e79e6f168a01 /java
parent811b5295dfca2d96d296866f9f42b86afa8a513e (diff)
parente6cfc2ff63e75c3c680d0968a3429a11efeac791 (diff)
downloadlatinime-e777c7bdc759d6b851f71dccd74fe8b06b9b4d00.tar.gz
latinime-e777c7bdc759d6b851f71dccd74fe8b06b9b4d00.tar.xz
latinime-e777c7bdc759d6b851f71dccd74fe8b06b9b4d00.zip
Merge "Revert "Revert "Use AAPT2""" into oc-dev
am: e6cfc2ff63 Change-Id: I7634a7cedd45ee01facad8cc91316ce7cf1544eb
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