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

e6cfc2ff · TreeHugger Robot · Android (Google) Code Review · 3ac57504 · 8c210e39 · e6cfc2ff
Commit e6cfc2ff authored 7 years ago by TreeHugger Robot Committed by Android (Google) Code Review 7 years ago
--- 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