diff options
author | Anton Hansson <hansson@google.com> | 2019-01-11 14:54:49 +0000 |
---|---|---|
committer | LuK1337 <priv.luk@gmail.com> | 2019-10-21 21:50:32 +0200 |
commit | c52dfa91a4263331c7957e31571d3f83c7b30128 (patch) | |
tree | a59d52aa004d138004e6db392a9c237e165b8500 | |
parent | 845946d053dc3d426603ce3e8e300eba92053e79 (diff) | |
download | android_packages_apps_Gallery2-c52dfa91a4263331c7957e31571d3f83c7b30128.tar.gz android_packages_apps_Gallery2-c52dfa91a4263331c7957e31571d3f83c7b30128.tar.bz2 android_packages_apps_Gallery2-c52dfa91a4263331c7957e31571d3f83c7b30128.zip |
Move Gallery2 and its libs to /productstaging/lineage-17.0lineage-17.0
This app is frequently overriden by proprietary apps
on shipping devices, so move it to /product along with
its jni libs.
Bug: 122353713
Test: launch gallery on aosp_arm64 emulator
Change-Id: I5f7ae53ef41a26c1b89b93cdae24178c2a99e261
-rw-r--r-- | Android.mk | 2 | ||||
-rw-r--r-- | CleanSpec.mk | 5 | ||||
-rw-r--r-- | jni/Android.mk | 3 | ||||
-rw-r--r-- | jni_jpegstream/Android.mk | 1 |
4 files changed, 10 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index f3eab2a4b..7ad76f101 100644 --- a/Android.mk +++ b/Android.mk @@ -35,6 +35,8 @@ LOCAL_CERTIFICATE := platform LOCAL_PRIVATE_PLATFORM_APIS := true +LOCAL_PRODUCT_MODULE := true + LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D LOCAL_AAPT_FLAGS += --rename-manifest-package com.android.gallery3d diff --git a/CleanSpec.mk b/CleanSpec.mk index 20db30919..acd9fcc8c 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -50,7 +50,10 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Gallery*) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Gallery*) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Gallery*) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Gallery*) - +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Gallery2) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libjni_gallery_jpegstream.so) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libjni_gallery_eglfence.so) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libjni_gallery_filters.so) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/jni/Android.mk b/jni/Android.mk index 28c6d78b7..ee6b360ce 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -20,6 +20,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjni_gallery_eglfence +LOCAL_PRODUCT_MODULE := true + LOCAL_LDLIBS := -llog -lEGL @@ -32,6 +34,7 @@ include $(CLEAR_VARS) LOCAL_CPP_EXTENSION := .cc LOCAL_SDK_VERSION := 9 LOCAL_MODULE := libjni_gallery_filters +LOCAL_PRODUCT_MODULE := true LOCAL_SRC_FILES := filters/gradient.c \ filters/saturated.c \ filters/exposure.c \ diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk index 76946f758..81ea28810 100644 --- a/jni_jpegstream/Android.mk +++ b/jni_jpegstream/Android.mk @@ -16,6 +16,7 @@ LOCAL_STATIC_LIBRARIES := libjpeg_static_ndk LOCAL_SDK_VERSION := 17 LOCAL_ARM_MODE := arm +LOCAL_PRODUCT_MODULE := true LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops LOCAL_CFLAGS += -Wall -Wextra -Werror |