commit d5a64ecfd7a87a12c69ed3204ff90e2ef193ca50
author Alan Viverette <alanv@google.com> Wed Apr 26 16:16:14 2017 -0400
committer Alan Viverette <alanv@google.com> Wed Apr 26 16:16:14 2017 -0400
tree 8e6f1c12e86f2636c52ddd415fe7c62274fc1039
parent 644751a0bdb9fe1d971362d428a510e4310ed259

Use AAPT2

Test: make checkbuild
Change-Id: I696f3157aaa1c1bce7e816050ed5e198307e4828

Android.mk

diff --git a/Android.mk b/Android.mk
index 24fb423..28eb5dc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,12 +16,14 @@
         org.apache.http.legacy
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
+        guava \
+        volley
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
         android-support-v7-appcompat \
         android-support-v7-preference \
         android-support-v7-recyclerview \
-        android-support-v14-preference \
-        guava \
-        volley
+        android-support-v14-preference
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
 LOCAL_SRC_FILES += \
@@ -30,6 +32,8 @@
         src/com/android/phone/INetworkQueryServiceCallback.aidl
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
 
+LOCAL_USE_AAPT2 := true
+
 LOCAL_AAPT_FLAGS := \
     --auto-add-overlay \
     --extra-packages com.android.phone.common \