From d42e6dcbee24b917936c1d670ca659970c76d4d1 Mon Sep 17 00:00:00 2001 From: Likai Ding Date: Mon, 19 Aug 2013 16:33:24 +0800 Subject: Gallery2: support live streaming and bookmarks Users can input a URL for streaming display. URL bookmarking is supported. Change-Id: Ia69497cdcfee963ba2209119a5b9dc82b64497da --- Android.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) mode change 100644 => 100755 Android.mk (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk old mode 100644 new mode 100755 index 3d5663e6b..0edfca54d --- a/Android.mk +++ b/Android.mk @@ -4,6 +4,8 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional +LOCAL_JAVA_LIBRARIES := telephony-common + LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit @@ -29,9 +31,11 @@ LOCAL_AAPT_FLAGS := --auto-add-overlay LOCAL_PACKAGE_NAME := Gallery2 +LOCAL_CERTIFICATE := platform + LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D -LOCAL_SDK_VERSION := current +#LOCAL_SDK_VERSION := current LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream -- cgit v1.2.3 From 38478f2cfc651b58dd88274c9a3bb7526c91116b Mon Sep 17 00:00:00 2001 From: Zhang Zhenzhen Date: Tue, 10 Mar 2015 16:40:13 +0800 Subject: Modify:Gallery2 for branch Gallery2 Conflicts: res/values-zh-rCN/strings.xml res/values/strings.xml Change-Id: I6b760469290ca154f223f94a3c284fca7a513121 --- Android.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 0edfca54d..661dac6ae 100755 --- a/Android.mk +++ b/Android.mk @@ -39,6 +39,11 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream +ifeq ($(TARGET_TS_MAKEUP), true) + LOCAL_JNI_SHARED_LIBRARIES := libts_detected_face_jni libts_face_beautify_jni + LOCAL_REQUIRED_MODULES := libts_detected_face_jni libts_face_beautify_jni +endif + LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_MULTILIB := 32 @@ -47,6 +52,12 @@ include $(BUILD_PACKAGE) ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),) +ifeq ($(TARGET_TS_MAKEUP), true) +include $(CLEAR_VARS) + LOCAL_PREBUILT_LIBS := jni_makeup_libs/libts_detected_face_jni.so jni_makeup_libs/libts_face_beautify_jni.so +include $(BUILD_MULTI_PREBUILT) +endif + # Use the following include to make gallery test apk include $(call all-makefiles-under, $(LOCAL_PATH)) -- cgit v1.2.3 From 692eabb9f888c384bb8520dfb9f5b3fe3ba02e24 Mon Sep 17 00:00:00 2001 From: Jay Wang Date: Thu, 12 Mar 2015 13:39:08 -0700 Subject: Gallery2: Move files to the correct location Change-Id: Ife7f7a2fa656cba06e2f713b27dcdadc720a021d --- Android.mk | 6 ------ 1 file changed, 6 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 661dac6ae..f515ac03f 100755 --- a/Android.mk +++ b/Android.mk @@ -52,12 +52,6 @@ include $(BUILD_PACKAGE) ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),) -ifeq ($(TARGET_TS_MAKEUP), true) -include $(CLEAR_VARS) - LOCAL_PREBUILT_LIBS := jni_makeup_libs/libts_detected_face_jni.so jni_makeup_libs/libts_face_beautify_jni.so -include $(BUILD_MULTI_PREBUILT) -endif - # Use the following include to make gallery test apk include $(call all-makefiles-under, $(LOCAL_PATH)) -- cgit v1.2.3 From 8c3144c8e7763fa7f24e3f0d20d035cb3bdd22a2 Mon Sep 17 00:00:00 2001 From: Jay Wang Date: Sun, 22 Mar 2015 02:46:26 -0700 Subject: Gallery2: Don't bundle beautification libraries Remove beautification libararies from LOCAL_JNI_SHARED_LIBRARIES as they are not planned to be bundled with Gallery2 apk Change-Id: I7508d775644a480ce5248cddf02b3a853b200cfb --- Android.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index f515ac03f..0b471b641 100755 --- a/Android.mk +++ b/Android.mk @@ -40,7 +40,6 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream ifeq ($(TARGET_TS_MAKEUP), true) - LOCAL_JNI_SHARED_LIBRARIES := libts_detected_face_jni libts_face_beautify_jni LOCAL_REQUIRED_MODULES := libts_detected_face_jni libts_face_beautify_jni endif -- cgit v1.2.3 From 650712e4615d4bbc25b07c11babfe824d7fb6f64 Mon Sep 17 00:00:00 2001 From: cretin45 Date: Mon, 15 Dec 2014 16:52:42 -0800 Subject: Gallery2: Fix filtershow renderscript for lollipop * Use the non support version Change-Id: Idce8f3f4741def8dcd080f226cd9a0ef909f7eb1 --- Android.mk | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 0b471b641..8721c36da 100755 --- a/Android.mk +++ b/Android.mk @@ -10,19 +10,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit LOCAL_STATIC_JAVA_LIBRARIES += mp4parser -LOCAL_STATIC_JAVA_LIBRARIES += android-support-v8-renderscript -LOCAL_RENDERSCRIPT_TARGET_API := 18 -LOCAL_RENDERSCRIPT_COMPATIBILITY := 18 -LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript - -# Keep track of previously compiled RS files too (from bundled GalleryGoogle). -prev_compiled_rs_files := $(call all-renderscript-files-under, src) - -# We already have these files from GalleryGoogle, so don't install them. -LOCAL_RENDERSCRIPT_SKIP_INSTALL := $(prev_compiled_rs_files) - -LOCAL_SRC_FILES := $(call all-java-files-under, src) $(prev_compiled_rs_files) +LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src) LOCAL_SRC_FILES += $(call all-java-files-under, src_pd) LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res -- cgit v1.2.3 From ef794533fb42f842353be20169bc514201d5e69a Mon Sep 17 00:00:00 2001 From: cretin45 Date: Thu, 30 Apr 2015 15:34:55 -0700 Subject: Gallery2: Use a slimmed down manifest on .inc builds Change-Id: I482c46947397a5ffb7e7086088bfab1c1c0c6b65 --- Android.mk | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 8721c36da..9443cfba3 100755 --- a/Android.mk +++ b/Android.mk @@ -32,6 +32,12 @@ ifeq ($(TARGET_TS_MAKEUP), true) LOCAL_REQUIRED_MODULES := libts_detected_face_jni libts_face_beautify_jni endif +ifeq ($(WITH_SLIM_GALLERY2), true) + LOCAL_MANIFEST_FILE := slim_manifest/AndroidManifest.xml +else + LOCAL_MANIFEST_FILE := AndroidManifest.xml +endif + LOCAL_PROGUARD_FLAG_FILES := proguard.flags LOCAL_MULTILIB := 32 -- cgit v1.2.3