Merge "Migrate to AAPT2" into pi-dev
diff --git a/tests/Android.mk b/tests/Android.mk
index 1892357..5f083de 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,19 +41,19 @@
LOCAL_RESOURCE_DIR := \
$(LOCAL_PATH)/res \
- $(LOCAL_PATH)/../res \
+ $(LOCAL_PATH)/../res
LOCAL_JAVA_LIBRARIES := \
- android.test.mock \
- android.test.base \
- android.test.runner \
- telephony-common
+ android.test.mock \
+ android.test.base \
+ android.test.runner \
+ telephony-common
LOCAL_USE_AAPT2 := true
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