Use explicit support library prebuilts
Test: make Launcher2
Test: make ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk
Change-Id: I06464ed810eb41455698dcabe0b605a5e51668d3
diff --git a/Android.mk b/Android.mk
index 0f24b22..9906e8d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,7 @@
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_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)
