summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kirill Grouchnikov <kirillg@google.com> 2017-08-01 09:35:13 -0400
committer Colin Cross <ccross@android.com> 2018-05-03 16:38:17 -0700
commitce93a98e4fcb8bf9920a1757d75eb1292fa81216 (patch)
treecffc3bc6dd160b8cb543d9f8175a5ea86ef01cc8
parentd6c9658d99c4f293d03e884817a091a74ccab278 (diff)
convert Uibench test to aapt2
Bug: NA Test: build Change-Id: Ibe70c6c15d8f72d40b1d6c2c43872d02a0bdb872 Merged-In: Ibe70c6c15d8f72d40b1d6c2c43872d02a0bdb872 (cherry picked from commit bffef1f024fbd7fb005a73d0744d7f8ee019fd27)
-rw-r--r--tests/UiBench/Android.mk22
1 files changed, 5 insertions, 17 deletions
diff --git a/tests/UiBench/Android.mk b/tests/UiBench/Android.mk
index e6af4b024700..60327e5cb2a4 100644
--- a/tests/UiBench/Android.mk
+++ b/tests/UiBench/Android.mk
@@ -10,23 +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/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.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 \