summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDake Gu <dake@google.com>2017-11-07 18:50:29 -0800
committerDake Gu <dake@google.com>2017-11-07 19:11:22 -0800
commitbffef1f024fbd7fb005a73d0744d7f8ee019fd27 (patch)
tree907b3bc374e432c0751ba78ad9e2657242da8bae
parentf45a96b990d7117b8802a12eeed5ad6f44d635a4 (diff)
convert Uibench test to aapt2
Bug: NA Test: build Change-Id: Ibe70c6c15d8f72d40b1d6c2c43872d02a0bdb872
-rw-r--r--tests/UiBench/Android.mk24
1 files changed, 5 insertions, 19 deletions
diff --git a/tests/UiBench/Android.mk b/tests/UiBench/Android.mk
index 0824c26ef9f1..60327e5cb2a4 100644
--- a/tests/UiBench/Android.mk
+++ b/tests/UiBench/Android.mk
@@ -10,25 +10,11 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src)
# use appcompat/support lib from the tree, so improvements/
# regressions are reflected in test data
-LOCAL_RESOURCE_DIR := \
- $(LOCAL_PATH)/res \
- frameworks/support/core-ui/res \
- frameworks/support/design/res \
- frameworks/support/v7/appcompat/res \
- frameworks/support/v7/cardview/res \
- frameworks/support/v7/recyclerview/res \
- frameworks/support/v17/leanback/res
-
-LOCAL_AAPT_FLAGS := \
- --auto-add-overlay \
- --extra-packages android.support.coreui \
- --extra-packages android.support.design \
- --extra-packages android.support.v7.appcompat \
- --extra-packages android.support.v7.cardview \
- --extra-packages android.support.v7.recyclerview \
- --extra-packages android.support.v17.leanback
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_USE_AAPT2 := true
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
android-support-design \
android-support-v4 \
android-support-v7-appcompat \