From af1177453d95d727651cf48a380d7979dc94ae45 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Mon, 15 May 2017 23:06:07 +0000
Subject: [PATCH] Revert "Use AAPT2"

This reverts commit 0f6f5c017629befcc4b8d9f1111e18d3505bfac1.

Change-Id: Ibba7d35846cdbf6086877fd2859c2e2c91dcf2ee
---
 java/Android.mk | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/java/Android.mk b/java/Android.mk
index 154f3a20c..b84b3471e 100644
--- 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