提交: 8bf14897b19fd1953d07bfe531ffcc271a516249 - packages-apps-Gallery2 (git)

packages/apps/Gallery2

Commit MetaInfo

• 修订版: 8bf14897b19fd1953d07bfe531ffcc271a516249 (tree)
• 时间: 2017-05-11 20:35:55
• 作者: Alan Viverette <alanv@goog...>
• Commiter: android-build-merger

Log Message

Merge "Fix makefile include for support-v4" into oc-dev am: 49496305fa
am: eee8680939

Change-Id: I173a593c8cd71e6cfdb47c6d9aadf8d99dc6c323

更改概述

• modified: Android.mk

差异

--- a/Android.mk
+++ b/Android.mk
@@ -4,8 +4,9 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-v4 \
+    android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser