summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2017-04-21 22:24:51 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-21 22:24:51 +0000
commitfe4151238550824e0f2eeeb6df694d05115c4364 (patch)
tree58e01c034bcd89d9c77424284d1a14b3eb464cc7
parentd147c8fbe83cf558b3e0d7b5a480f324993cdbdb (diff)
parente61357b2fc907f6206cd213da030f8c15ed05a30 (diff)
downloadLauncher2-fe4151238550824e0f2eeeb6df694d05115c4364.tar.gz
Update to use STATIC_ANDROID_LIBRARIES
am: e61357b2fc Change-Id: I300ebc90f7bf50dd6c83608d420eeb7f5b3bc5a6
-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)