summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2017-04-21 10:52:19 -0400
committerAlan Viverette <alanv@google.com>2017-04-21 10:52:19 -0400
commit48653775d928479c89bcd564b0045caa7608148b (patch)
tree2785b2fe4110e36beefbc7c51643119ea41f93e9
parent51adb19e94d9c7b0918f8aba644694ad3ebc4ae9 (diff)
downloadLauncher2-48653775d928479c89bcd564b0045caa7608148b.tar.gz
Use explicit support library prebuilts
Test: make Launcher2 Test: make ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk Change-Id: I06464ed810eb41455698dcabe0b605a5e51668d3
-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)