summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-05-03 08:42:47 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-05-03 08:42:47 +0000
commit8fba5abb014722ad2f8e5dae35e3873a72dcc0ce (patch)
treeaafb595d6a828010ea5180c0c840ff17da6a6d74
parentdcdc0ba57ce0784f61767cc16e9a660a7ee78993 (diff)
parentedfdb5295f2b016fd08add66bf4213a0c7efe0b6 (diff)
downloadandroid_packages_wallpapers_LivePicker-8fba5abb014722ad2f8e5dae35e3873a72dcc0ce.tar.gz
android_packages_wallpapers_LivePicker-8fba5abb014722ad2f8e5dae35e3873a72dcc0ce.tar.bz2
android_packages_wallpapers_LivePicker-8fba5abb014722ad2f8e5dae35e3873a72dcc0ce.zip
release-request-148314be-b6e7-4b4d-b50e-ab6405ef3c8a-for-git_oc-dr1-release-3968906 snap-temp-L55700000060028590
Change-Id: Ic8609977b848c3bd3c2517f690b6a01ee7fbf436
-rw-r--r--Android.mk13
1 files changed, 3 insertions, 10 deletions
diff --git a/Android.mk b/Android.mk
index 885e474..32ca5f3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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)