diff options
| author | Alan Viverette <alanv@google.com> | 2017-05-02 13:12:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-02 13:12:46 +0000 |
| commit | 031b3d756e490106f3690a421c6fc2f23430e135 (patch) | |
| tree | 7a16220653284d82cb078cecfc4f36391dd80184 | |
| parent | 5b6ba547254c87a60947f9d45aa7219fbc5fe140 (diff) | |
| parent | 88597e17731c3523e389b143a16c572e1b66c30c (diff) | |
| download | android_packages_wallpapers_LivePicker-031b3d756e490106f3690a421c6fc2f23430e135.tar.gz android_packages_wallpapers_LivePicker-031b3d756e490106f3690a421c6fc2f23430e135.tar.bz2 android_packages_wallpapers_LivePicker-031b3d756e490106f3690a421c6fc2f23430e135.zip | |
Merge "Use AAPT2" into oc-dev
am: 88597e1773
Change-Id: I38a72f24e5a61dac2553b7ee3d35200642c7e8f2
| -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) |