From be2aa185ad6c9a0523273c9493098622c753f0be Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Fri, 11 Jan 2019 14:54:49 +0000
Subject: [PATCH] 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
---
 Android.mk                | 2 ++
 CleanSpec.mk              | 5 ++++-
 jni/Android.mk            | 3 +++
 jni_jpegstream/Android.mk | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 34d7cb481..9d0a90ab7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -26,6 +26,8 @@ LOCAL_USE_AAPT2 := true
 
 LOCAL_PACKAGE_NAME := Gallery2
 
+LOCAL_PRODUCT_MODULE := true
+
 LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
 
 LOCAL_SDK_VERSION := current
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 20db30919..057623423 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_jpegstream.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libjni_eglfence.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libjni_filtershow_filters.so)
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/jni/Android.mk b/jni/Android.mk
index 55bb205de..c08d7be89 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -20,6 +20,8 @@ LOCAL_MODULE_TAGS := optional
 
 LOCAL_MODULE := libjni_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_filtershow_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 86ed7977c..4bf33e036 100644
--- a/jni_jpegstream/Android.mk
+++ b/jni_jpegstream/Android.mk
@@ -15,6 +15,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
-- 
2.11.0