commit 1cc32e1c3fdc9afbff57acd19ea58fd310440eab
author Alan Viverette <alanv@google.com> Fri Apr 21 10:47:41 2017 -0400
committer LuK1337 <priv.luk@gmail.com> Thu Nov 26 11:21:26 2020 +0100
tree a2c04fd53004bae45c6273235aa19ef21fdcb8d8
parent 46ee5516fe35150de7a23b9ab64d43a0609c24f3

Use explicit support library prebuilts

Test: make Gallery2
Test: make ANDROID_BUILDSPEC=vendor/google/build/app_build_spec.mk
Change-Id: I59208256a3abd71ef8b352b132a4de0d61d88c03

Android.mk

diff --git a/Android.mk b/Android.mk
index e0df380..886b777 100755
--- a/Android.mk
+++ b/Android.mk
@@ -6,7 +6,7 @@
 
 LOCAL_JAVA_LIBRARIES := telephony-common
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13-prebuilt
 LOCAL_STATIC_JAVA_LIBRARIES += org.codeaurora.gallery.common
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
@@ -30,7 +30,7 @@
 
 # $(warning Anand Commend LOCAL_RENDERSCRIPT_SKIP_INSTALL is $(LOCAL_RENDERSCRIPT_SKIP_INSTALL))
 
-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