diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-05-02 13:09:01 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-02 13:09:01 +0000 |
commit | 88597e17731c3523e389b143a16c572e1b66c30c (patch) | |
tree | 60c3bcfdfbc3ce727e389f4be835c10a3e99f28a | |
parent | 58c8cac130dc53343067526b9acdbfffcabbcfec (diff) | |
parent | 521d439ddd0478a1c0b1c6216c9d6e578024b7c6 (diff) | |
download | android_packages_wallpapers_LivePicker-88597e17731c3523e389b143a16c572e1b66c30c.tar.gz android_packages_wallpapers_LivePicker-88597e17731c3523e389b143a16c572e1b66c30c.tar.bz2 android_packages_wallpapers_LivePicker-88597e17731c3523e389b143a16c572e1b66c30c.zip |
Merge "Use AAPT2" into oc-dev
-rw-r--r-- | Android.mk | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -46,22 +46,15 @@ LOCAL_CERTIFICATE := platform LOCAL_PROGUARD_FLAG_FILES := proguard.flags -LOCAL_STATIC_JAVA_LIBRARIES := \ +LOCAL_STATIC_ANDROID_LIBRARIES := \ android-support-v7-appcompat \ android-support-v4 \ android-support-design \ android-support-transition \ android-support-v7-recyclerview -LOCAL_RESOURCE_DIR := \ - $(LOCAL_PATH)/res \ - frameworks/support/v7/appcompat/res \ - frameworks/support/design/res \ - frameworks/support/transition/res \ +LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res -LOCAL_AAPT_FLAGS := --auto-add-overlay \ - --extra-packages android.support.design \ - --extra-packages android.support.v7.appcompat \ - --extra-packages android.support.transition +LOCAL_USE_AAPT2 := true include $(BUILD_PACKAGE) |