diff options
| author | Alan Viverette <alanv@google.com> | 2017-05-02 16:06:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-02 16:06:26 +0000 |
| commit | edfdb5295f2b016fd08add66bf4213a0c7efe0b6 (patch) | |
| tree | aafb595d6a828010ea5180c0c840ff17da6a6d74 | |
| parent | b89db6479d601c5b5ce3dc508972411f5804b35c (diff) | |
| parent | 031b3d756e490106f3690a421c6fc2f23430e135 (diff) | |
| download | android_packages_wallpapers_LivePicker-edfdb5295f2b016fd08add66bf4213a0c7efe0b6.tar.gz android_packages_wallpapers_LivePicker-edfdb5295f2b016fd08add66bf4213a0c7efe0b6.tar.bz2 android_packages_wallpapers_LivePicker-edfdb5295f2b016fd08add66bf4213a0c7efe0b6.zip | |
Merge "Use AAPT2" into oc-dev am: 88597e1773
am: 031b3d756e
Change-Id: Ifc2c2068288b315750f2247bc0e34618bd081a6e
| -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) |