summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2017-04-21 17:05:37 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-21 17:05:37 +0000
commit829465caefbed56199087fc4681f985f500a8e6c (patch)
tree2785b2fe4110e36beefbc7c51643119ea41f93e9
parent88d9ea4cb9450df58693ae8505797f8e71eefca1 (diff)
parentd147c8fbe83cf558b3e0d7b5a480f324993cdbdb (diff)
downloadLauncher2-829465caefbed56199087fc4681f985f500a8e6c.tar.gz
Use explicit support library prebuilts am: 48653775d9
am: d147c8fbe8 Change-Id: I04ece4c6249008872aeb5c32b9d8ae52b7978390
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 0f24b220..9906e8dc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := android-common android-support-v13
+LOCAL_STATIC_JAVA_LIBRARIES := android-common android-support-v13-prebuilt
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
LOCAL_SDK_VERSION := current
@@ -34,7 +34,7 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_AAPT_FLAGS := --auto-add-overlay
LOCAL_AAPT_FLAGS += --extra-packages android.support.compat
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res $(LOCAL_PATH)/../../../$(SUPPORT_LIBRARY_ROOT)/compat/res
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
include $(BUILD_PACKAGE)