summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2017-04-21 17:02:15 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-21 17:02:15 +0000
commitc66df7ddf93788866027c51fda5addf12131ff07 (patch)
tree4d9bb874798c8105b7bfaab116b46ce9315963e6
parenta86c0f3f2903c28cfa386aff5f32b43350381b2d (diff)
parent0673572ff9a65486885b7062c31e773ac5084e81 (diff)
downloadandroid_packages_apps_Gallery2-c66df7ddf93788866027c51fda5addf12131ff07.tar.gz
android_packages_apps_Gallery2-c66df7ddf93788866027c51fda5addf12131ff07.tar.bz2
android_packages_apps_Gallery2-c66df7ddf93788866027c51fda5addf12131ff07.zip
Use explicit support library prebuilts
am: 0673572ff9 Change-Id: I151e95a4943294d0c1a8f2f8565f4ef79b16f610
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 14274224b..f683ae75f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13-prebuilt
LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
@@ -14,7 +14,7 @@ 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_PATH)/../../../$(SUPPORT_LIBRARY_ROOT)/compat/res
+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
LOCAL_AAPT_FLAGS := --auto-add-overlay
LOCAL_AAPT_FLAGS += --extra-packages android.support.compat