commit 4b857f2514adc75f57e65462cf7f18d38dc1bc45
author Alan Viverette <alanv@google.com> Fri Mar 23 14:31:37 2018 -0400
committer Colin Cross <ccross@android.com> Thu May 03 16:38:17 2018 -0700
tree fbc9fd5ead185c9d32eb682bdda26826226fe315
parent acdcb3f1e0097b5b188acf0bf4c7174ca9358935

Migrate to AAPT2

Bug: 73128633
Test: m TelecomUnitTests
Change-Id: I21d87f83e0d8846bf3dff471df58fd4ce2d432a8
Merged-In: I21d87f83e0d8846bf3dff471df58fd4ce2d432a8
(cherry picked from commit 26f8daa61ef2590ad120792234cae062e4208611)

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index 6a7af24..05d0f9d 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -18,17 +18,22 @@
 include $(CLEAR_VARS)
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-        android-ex-camera2 \
-        android-support-v4 \
-        android-support-test \
-        guava \
-        mockito-target \
-        platform-test-annotations
+    android-ex-camera2 \
+    guava \
+    mockito-target \
+    android-support-test \
+    platform-test-annotations
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+    android-support-core-ui \
+    android-support-core-utils \
+    android-support-compat \
+    android-support-fragment
 
 LOCAL_SRC_FILES := \
-        $(call all-java-files-under, src) \
-        $(call all-java-files-under, ../src) \
-        $(call all-proto-files-under, ../proto)
+    $(call all-java-files-under, src) \
+    $(call all-java-files-under, ../src) \
+    $(call all-proto-files-under, ../proto)
 
 LOCAL_PROTOC_OPTIMIZE_TYPE := nano
 LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/../proto/
@@ -36,8 +41,7 @@
 
 LOCAL_RESOURCE_DIR := \
     $(LOCAL_PATH)/res \
-    $(LOCAL_PATH)/../res \
-    $(SUPPORT_LIBRARY_ROOT)/compat/res
+    $(LOCAL_PATH)/../res
 
 LOCAL_JAVA_LIBRARIES := \
         android.test.mock \
@@ -49,7 +53,7 @@
 
 LOCAL_AAPT_FLAGS := \
     --auto-add-overlay \
-    --extra-packages com.android.server.telecom:android.support.compat
+    --extra-packages com.android.server.telecom
 
 LOCAL_JACK_FLAGS := --multi-dex native