diff options
| author | Alan Viverette <alanv@google.com> | 2017-04-27 15:16:37 -0400 |
|---|---|---|
| committer | LuK1337 <priv.luk@gmail.com> | 2019-10-21 21:40:56 +0200 |
| commit | 76063e3ee77e64ed6f32c1172f7e36d71521568f (patch) | |
| tree | 3e2ebd1cff769673a6e139b0891db2962220f100 /Android.mk | |
| parent | 42ede8e9d76de1f674888cc20478a8d7ce5f04a8 (diff) | |
| download | android_packages_apps_Gallery2-76063e3ee77e64ed6f32c1172f7e36d71521568f.tar.gz android_packages_apps_Gallery2-76063e3ee77e64ed6f32c1172f7e36d71521568f.tar.bz2 android_packages_apps_Gallery2-76063e3ee77e64ed6f32c1172f7e36d71521568f.zip | |
Fix proguard failure when using javac
Test: make Gallery2 ANDROID_COMPILE_WITH_JACK=false
Change-Id: Ic2576ffb72fde8677bdbf1d9f46baacc88a5b999
Diffstat (limited to 'Android.mk')
| -rwxr-xr-x | Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 31668fd28..2ec002a33 100755 --- a/Android.mk +++ b/Android.mk @@ -6,7 +6,8 @@ LOCAL_MODULE_TAGS := optional 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 @@ LOCAL_SRC_FILES += $(call all-java-files-under, src_pd) # $(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 |