• 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

修订版86f481b8aea757cded9c2179dd5298b291de5e73 (tree)
时间2017-12-12 07:57:32
作者Alan Viverette <alanv@goog...>
CommiterAlan Viverette

Log Message

Move Gallery2 over to AAPT2 and new v4 modules

Bug: 35994894
Test: make
Change-Id: I00cacda9dc8dc9ac919958cc7a8bd432680b85d7

更改概述

差异

--- a/Android.mk
+++ b/Android.mk
@@ -4,28 +4,25 @@ include $(CLEAR_VARS)
44
55 LOCAL_MODULE_TAGS := optional
66
7-LOCAL_STATIC_JAVA_LIBRARIES := \
8- android-support-v4 \
7+LOCAL_STATIC_ANDROID_LIBRARIES := \
8+ android-support-fragment \
9+ android-support-core-ui \
10+ android-support-compat \
911 android-support-v13
10-LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
11-LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
12-LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
12+
13+LOCAL_STATIC_JAVA_LIBRARIES := \
14+ com.android.gallery3d.common2 \
15+ xmp_toolkit \
16+ mp4parser
1317
1418 LOCAL_SRC_FILES := \
1519 $(call all-java-files-under, src) \
16- $(call all-renderscript-files-under, src)
17-LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
20+ $(call all-renderscript-files-under, src) \
21+ $(call all-java-files-under, src_pd)
1822
19-LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res \
20- $(LOCAL_PATH)/../../../frameworks/support/compat/res \
21- $(LOCAL_PATH)/../../../frameworks/support/media-compat/res \
22- $(LOCAL_PATH)/../../../frameworks/support/core-ui/res
23+LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res
2324
24-LOCAL_AAPT_FLAGS := --auto-add-overlay
25-LOCAL_AAPT_FLAGS += \
26- --extra-packages android.support.compat \
27- --extra-packages android.support.mediacompat \
28- --extra-packages android.support.coreui \
25+LOCAL_USE_AAPT2 := true
2926
3027 LOCAL_PACKAGE_NAME := Gallery2
3128
@@ -33,7 +30,10 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
3330
3431 LOCAL_SDK_VERSION := current
3532
36-LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters libjni_jpegstream
33+LOCAL_JNI_SHARED_LIBRARIES := \
34+ libjni_eglfence \
35+ libjni_filtershow_filters \
36+ libjni_jpegstream
3737
3838 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
3939