From 0f6f5c017629befcc4b8d9f1111e18d3505bfac1 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Wed, 26 Apr 2017 16:13:45 -0400
Subject: [PATCH] Use AAPT2

Test: make checkbuild
Change-Id: I8478dd61a2edf8f87437276025ed57092c1b047c
---
 java/Android.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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