From 084ef10d7d163ade1f68ead4e3bea9f223d1ce7f Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Thu, 27 Apr 2017 15:16:37 -0400 Subject: [PATCH] Fix proguard failure when using javac Test: make Gallery2 ANDROID_COMPILE_WITH_JACK=false Change-Id: Ic2576ffb72fde8677bdbf1d9f46baacc88a5b999 --- Android.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index f683ae75f..47e9c864c 100644 --- a/Android.mk +++ b/Android.mk @@ -4,7 +4,8 @@ include $(CLEAR_VARS) 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 @@ 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_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 -- 2.11.0