packages/apps/Gallery2
修订版 | 81b2fa8e079d9e317d824c8834a2b6cc5bc53b55 (tree) |
---|---|
时间 | 2017-12-12 17:27:37 |
作者 | android-build-team Robot <android-build-team-robot@goog...> |
Commiter | android-build-team Robot |
Snap for 4498106 from 86f481b8aea757cded9c2179dd5298b291de5e73 to pi-release
Change-Id: Ie210fdbc535e1951a428fa5ba7ca27abf0034e1a
@@ -4,28 +4,25 @@ include $(CLEAR_VARS) | ||
4 | 4 | |
5 | 5 | LOCAL_MODULE_TAGS := optional |
6 | 6 | |
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 \ | |
9 | 11 | 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 | |
13 | 17 | |
14 | 18 | LOCAL_SRC_FILES := \ |
15 | 19 | $(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) | |
18 | 22 | |
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 | |
23 | 24 | |
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 | |
29 | 26 | |
30 | 27 | LOCAL_PACKAGE_NAME := Gallery2 |
31 | 28 |
@@ -33,7 +30,10 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D | ||
33 | 30 | |
34 | 31 | LOCAL_SDK_VERSION := current |
35 | 32 | |
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 | |
37 | 37 | |
38 | 38 | LOCAL_PROGUARD_FLAG_FILES := proguard.flags |
39 | 39 |