commit 084ef10d7d163ade1f68ead4e3bea9f223d1ce7f
author Alan Viverette <alanv@google.com> Thu Apr 27 15:16:37 2017 -0400
committer Alan Viverette <alanv@google.com> Thu Apr 27 15:16:37 2017 -0400
tree 52c100f49407999d6099c303a5a083dac72f14c3
parent 0673572ff9a65486885b7062c31e773ac5084e81

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 f683ae7..47e9c86 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,7 +4,8 @@
 
 LOCAL_MODULE_TAGS := optional
 
-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 += com.android.gallery3d.common2
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
@@ -14,7 +15,8 @@
     $(call all-renderscript-files-under, src)
 LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
 
-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