commit 34c163aabd9474417e7ced5a6d60133098f51a95
author Alan Viverette <alanv@google.com> Tue May 02 17:18:27 2017 +0000
committer Alan Viverette <alanv@google.com> Tue May 02 17:18:27 2017 +0000
tree cdb5539223972a90c9a1839c990f2d297255259f
parent d5a64ecfd7a87a12c69ed3204ff90e2ef193ca50

Revert "Use AAPT2"

Breaking TeleService on sailfish-eng checkbuild, apparently.

This reverts commit d5a64ecfd7a87a12c69ed3204ff90e2ef193ca50.

Change-Id: I491fb0909804c1940a2e211737cdf810db0996c6

Android.mk

diff --git a/Android.mk b/Android.mk
index 28eb5dc..24fb423 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,14 +16,12 @@
         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
+        android-support-v14-preference \
+        guava \
+        volley
 
 LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))
 LOCAL_SRC_FILES += \
@@ -32,8 +30,6 @@
         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 \