Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "soong_support_libs"

Browse Source 
am: 3e20d23cf7

Change-Id: Iafd7255c47e296f3054466c35af8e19a6566879f
This commit is contained in:
Colin Cross
2018-05-07 12:26:15 -07:00
committed by android-build-merger
parent fcb42958e9 3e20d23cf7
commit a804215d9c
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/UiBench/Android.mk
View File

@@ -10,23 +10,11 @@ LOCAL_SRC_FILES := $(call all-java-files-under,src)
# use appcompat/support lib from the tree, so improvements/ # use appcompat/support lib from the tree, so improvements/
# regressions are reflected in test data # regressions are reflected in test data
LOCAL_RESOURCE_DIR := \ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
$(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 := \ LOCAL_USE_AAPT2 := true
--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_STATIC_ANDROID_LIBRARIES := \
android-support-design \ android-support-design \
android-support-v4 \ android-support-v4 \
android-support-v7-appcompat \ android-support-v7-appcompat \