summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2017-04-21 22:28:22 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-21 22:28:22 +0000
commit15e0024390d2532c4da7a068ac8ad7886af54ff0 (patch)
tree58e01c034bcd89d9c77424284d1a14b3eb464cc7
parent829465caefbed56199087fc4681f985f500a8e6c (diff)
parentfe4151238550824e0f2eeeb6df694d05115c4364 (diff)
downloadLauncher2-15e0024390d2532c4da7a068ac8ad7886af54ff0.tar.gz
Update to use STATIC_ANDROID_LIBRARIES am: e61357b2fc
am: fe41512385 Change-Id: I59b59775dc99f9c7d7eae41bb557ba4540430a80
-rw-r--r--Android.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 9906e8dc..fc15f32d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,10 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := android-common android-support-v13-prebuilt
+LOCAL_STATIC_JAVA_LIBRARIES := android-common
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ android-support-v13
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
LOCAL_SDK_VERSION := current
@@ -32,8 +35,7 @@ LOCAL_OVERRIDES_PACKAGES := Home
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages android.support.compat
+LOCAL_USE_AAPT2 := true
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
include $(BUILD_PACKAGE)