From 0673572ff9a65486885b7062c31e773ac5084e81 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Fri, 21 Apr 2017 10:47:41 -0400 Subject: [PATCH] Use explicit support library prebuilts Test: make Gallery2 Test: make ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk Change-Id: I59208256a3abd71ef8b352b132a4de0d61d88c03 --- Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index 14274224b..f683ae75f 100644 --- a/Android.mk +++ b/Android.mk @@ -4,7 +4,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 +LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13-prebuilt LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit LOCAL_STATIC_JAVA_LIBRARIES += mp4parser @@ -14,7 +14,7 @@ LOCAL_SRC_FILES := \ $(call all-renderscript-files-under, src) LOCAL_SRC_FILES += $(call all-java-files-under, src_pd) -LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res $(LOCAL_PATH)/../../../$(SUPPORT_LIBRARY_ROOT)/compat/res +LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res LOCAL_AAPT_FLAGS := --auto-add-overlay LOCAL_AAPT_FLAGS += --extra-packages android.support.compat -- 2.11.0