diff options
| author | Alan Viverette <alanv@google.com> | 2017-04-27 19:35:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-27 19:35:54 +0000 |
| commit | 62c70f5f3d172dfdd518160ed3db1655760074df (patch) | |
| tree | 69575c8a39dbb2a2b80fa5a2ffe7a90d828d0dcb | |
| parent | af2b7292b1410bfe18f8ad3a42352f35081ebf33 (diff) | |
| parent | f62a9d75dbf4726daacfbe2a9fc327381a00c011 (diff) | |
| download | android_packages_apps_Gallery2-62c70f5f3d172dfdd518160ed3db1655760074df.tar.gz android_packages_apps_Gallery2-62c70f5f3d172dfdd518160ed3db1655760074df.tar.bz2 android_packages_apps_Gallery2-62c70f5f3d172dfdd518160ed3db1655760074df.zip | |
Fix proguard failure when using javac am: 084ef10d7d
am: f62a9d75db
Change-Id: I9cc4269d87a884d0e66adc8ec78d71f06eefa03d
| -rw-r--r-- | Android.mk | 6 |
1 files 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 |