commit fbcba10fad91f29d32ef430162bc0de912a02455
author Aurimas Liutikas <aurimas@google.com> Mon Dec 04 19:01:49 2017 -0800
committer Colin Cross <ccross@android.com> Wed May 02 10:04:39 2018 -0700
tree 82216b6fba7ff9d3af2385c68ef1a25b35732f79
parent 39f6d948d7855ad0ef70a741e7b1592141c7134a

Migrate TeleService to aapt2.

Test: make -j TeleService
Change-Id: I73488b8a55d1eb295ca1f24cdef8d0326513eba8
Merged-In: I73488b8a55d1eb295ca1f24cdef8d0326513eba8
(cherry picked from commit 9f24ec1753690219d477bc362450fe46650253d9)

Android.mk

diff --git a/Android.mk b/Android.mk
index 4846ea1..e30a4fc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -15,11 +15,13 @@
         ims-common \
         org.apache.http.legacy
 
-LOCAL_STATIC_JAVA_LIBRARIES := \
+LOCAL_STATIC_ANDROID_LIBRARIES := \
         android-support-v7-appcompat \
         android-support-v7-preference \
         android-support-v7-recyclerview \
-        android-support-v14-preference \
+        android-support-v14-preference
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
         guava \
         volley
 
@@ -29,21 +31,11 @@
         src/com/android/phone/INetworkQueryService.aidl \
         src/com/android/phone/INetworkQueryServiceCallback.aidl
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
-
-LOCAL_RESOURCE_DIR += \
-    frameworks/support/v7/appcompat/res \
-    frameworks/support/v7/preference/res \
-    frameworks/support/v7/recyclerview/res \
-    frameworks/support/v14/preference/res
+LOCAL_USE_AAPT2 := true
 
 LOCAL_AAPT_FLAGS := \
-    --auto-add-overlay \
     --extra-packages com.android.phone.common \
-    --extra-packages com.android.services.telephony.sip \
-    --extra-packages android.support.v7.appcompat \
-    --extra-packages android.support.v7.preference \
-    --extra-packages android.support.v7.recyclerview \
-    --extra-packages android.support.v14.preference
+    --extra-packages com.android.services.telephony.sip
 
 LOCAL_PACKAGE_NAME := TeleService
 LOCAL_PRIVATE_PLATFORM_APIS := true