From 8e173329e0b7a645a56d54ccef2a8bd520b9b673 Mon Sep 17 00:00:00 2001
From: Po-Chien Hsueh <pchsueh@google.com>
Date: Tue, 13 Aug 2019 16:48:24 +0800
Subject: [PATCH] Move Messaging to /product

Move Messaging to /product as we usually override it by proprietary
apps on shipping devices.

Bug: 138283161
Test: Run this app on aosp_crosshatch
Change-Id: I30e1f291f249e15b0d9131cfa72cc9e9f4a37234
---
 Android.mk   |  4 +++-
 CleanSpec.mk | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 CleanSpec.mk

diff --git a/Android.mk b/Android.mk
index cad55d5..09214ba 100644
--- a/Android.mk
+++ b/Android.mk
@@ -71,7 +71,9 @@ LOCAL_CERTIFICATE := platform
 
 LOCAL_SDK_VERSION := current
 
-LOCAL_MODULE_PATH := $(TARGET_OUT_APPS)
+LOCAL_PRODUCT_MODULE := true
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_APPS)
 
 LOCAL_COMPATIBILITY_SUITE := general-tests
 
diff --git a/CleanSpec.mk b/CleanSpec.mk
new file mode 100644
index 0000000..1391c1a
--- /dev/null
+++ b/CleanSpec.mk
@@ -0,0 +1,41 @@
+# Copyright (C) 2017 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list.  These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list.  E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/messaging)