commit e6cfc2ff63e75c3c680d0968a3429a11efeac791
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 19 00:00:47 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 19 00:00:48 2017 +0000
tree 0e14d42931c4a1373638652a5514124d80606290
parent 3ac57504cd087083865cb47fd0c295ebd6caf747
parent 8c210e394876239b23a22be24c0f2d2be4b678c2

Merge "Revert "Revert "Use AAPT2""" into oc-dev

java/Android.mk

diff --git a/java/Android.mk b/java/Android.mk
index b84b347..154f3a2 100644
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -26,7 +26,12 @@
 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