• R/O
  • HTTP
  • SSH
  • HTTPS

提交

标签
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-cqtcocoa誰得pythonphprubygameguibathyscaphec翻訳計画中(planning stage)omegatframeworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

packages/apps/Gallery2


Commit MetaInfo

修订版eee86809398e12c9b9f88bcfbc0716ce798dcac5 (tree)
时间2017-05-11 14:39:02
作者Alan Viverette <alanv@goog...>
Commiterandroid-build-merger

Log Message

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

Change-Id: Ibddf02770acad6c1039c42ea72d447a63a1300b3

更改概述

差异

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