Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a804215d authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge changes from topic "soong_support_libs" 

am: 3e20d23c

Change-Id: Iafd7255c47e296f3054466c35af8e19a6566879f
parents fcb42958 3e20d23c

tests/UiBench/Android.mk

+5 −17
Original line number Diff line number Diff line
@@ -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 \