commit 8c210e394876239b23a22be24c0f2d2be4b678c2
author Adam Lesinski <adamlesinski@google.com> Wed May 17 22:54:28 2017 +0000
committer Adam Lesinski <adamlesinski@google.com> Wed May 17 22:54:28 2017 +0000
tree d29f7532042393095473188e2889f0ca49c50fc5
parent af1177453d95d727651cf48a380d7979dc94ae45

Revert "Revert "Use AAPT2""

This reverts commit af1177453d95d727651cf48a380d7979dc94ae45.

Reason for revert: Bug in aapt2 was fixed b/38152130

Change-Id: I2701d67f581165d371a745749367c0c825168e22

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