commit 27be9ad31ccd8a6083b7805cbfc22ed787a48a6c
author Alan Viverette <alanv@google.com> Thu Apr 27 15:16:37 2017 -0400
committer LuK1337 <priv.luk@gmail.com> Thu Nov 26 11:21:26 2020 +0100
tree cfb48c1765b3cf89d06df4f652e8de9ce0e1a33b
parent 1cc32e1c3fdc9afbff57acd19ea58fd310440eab

Fix proguard failure when using javac

Test: make Gallery2 ANDROID_COMPILE_WITH_JACK=false
Change-Id: Ic2576ffb72fde8677bdbf1d9f46baacc88a5b999

Android.mk

diff --git a/Android.mk b/Android.mk
index 886b777..973cc3e 100755
--- a/Android.mk
+++ b/Android.mk
@@ -6,7 +6,8 @@
 
 LOCAL_JAVA_LIBRARIES := telephony-common
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13-prebuilt
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += org.codeaurora.gallery.common
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
@@ -30,7 +31,8 @@
 
 # $(warning Anand Commend LOCAL_RENDERSCRIPT_SKIP_INSTALL is $(LOCAL_RENDERSCRIPT_SKIP_INSTALL))
 
-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res \
+    $(LOCAL_PATH)/../../../frameworks/support/compat/res
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay
 LOCAL_AAPT_FLAGS += --extra-packages android.support.compat