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

am: 3ac57504 Change-Id: I45cb9a9ecfe5d273a2bfd56463c7a7ada868bf67

Merge "Revert "Use AAPT2"" into oc-dev
811b5295 · Alan Viverette · android-build-merger · 28f867d7 · 3ac57504 · 811b5295
Commit 811b5295 authored 7 years ago by Alan Viverette Committed by android-build-merger 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