Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c52dfa91 authored by Anton Hansson's avatar Anton Hansson Committed by LuK1337
Browse files

Move Gallery2 and its libs to /product 

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
parent 845946d0

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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

CleanSpec.mk

+4 −1
Original line number Diff line number Diff line
@@ -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

# ************************************************

jni/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -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 \

jni_jpegstream/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -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