summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-05-02 17:57:13 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-05-02 17:57:13 +0000
commit437df04371adcb7c62c9e433c86451231511d570 (patch)
tree69575c8a39dbb2a2b80fa5a2ffe7a90d828d0dcb
parentf0c8e85da683130ca6b898ddd0a4a5df57006f43 (diff)
parent5b8c15cf3bb1fafc8f8d786df62453d9f905eb9a (diff)
downloadandroid_packages_apps_Gallery2-437df04371adcb7c62c9e433c86451231511d570.tar.gz
android_packages_apps_Gallery2-437df04371adcb7c62c9e433c86451231511d570.tar.bz2
android_packages_apps_Gallery2-437df04371adcb7c62c9e433c86451231511d570.zip
release-request-e44ed829-e254-4762-ae37-a7739a0f37fb-for-git_oc-dr1-release-3964285 snap-temp-L49200000059745790
Change-Id: I634dc294bd988fc4bcc56680712ff1da3bc8349a
-rw-r--r--Android.mk6
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