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

3ac57504 · TreeHugger Robot · Android (Google) Code Review · add95c01 · af117745 · 3ac57504
Commit 3ac57504 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,12 +26,7 @@ LOCAL_CERTIFICATE := shared
 LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime

 LOCAL_STATIC_JAVA_LIBRARIES := \
-        android-common inputmethod-common jsr305 latinime-common
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
-        android-support-v4
-
-LOCAL_USE_AAPT2 := true
+        android-common inputmethod-common android-support-v4 jsr305 latinime-common

 # Do not compress dictionary files to mmap dict data runtime
 LOCAL_AAPT_FLAGS := -0 .dict