From 1c429e3a0914ba152eca2c43450ac74f24cba58e Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Fri, 11 Jan 2019 14:56:36 +0000
Subject: [PATCH] Move LatinIME and its lib to /product

This app is frequently overriden by proprietary apps
on shipping devices, so move it to /product along with
its jni library.

Bug: 122353713
Test: launch keyboard on aosp_arm64 emulator
Change-Id: Ied8c1e6133b67e28da76b0e48254e2e2e0ed15bf
---
 CleanSpec.mk          | 3 +++
 java/Android.bp       | 2 ++
 native/jni/Android.bp | 1 +
 3 files changed, 6 insertions(+)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index be13c30aa..98df622fa 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -52,6 +52,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinim
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/LatinIME)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libjni_latinime.so)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/java/Android.bp b/java/Android.bp
index 8681c8414..f6dc59661 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -40,6 +40,8 @@ android_app {
 
     sdk_version: "current",
 
+    product_specific: true,
+
     optimize: {
         proguard_flags_files: ["proguard.flags"],
     },
diff --git a/native/jni/Android.bp b/native/jni/Android.bp
index 3bf70ad49..0d4b3bb65 100644
--- a/native/jni/Android.bp
+++ b/native/jni/Android.bp
@@ -105,6 +105,7 @@ filegroup {
 cc_library {
     name: "libjni_latinime",
     host_supported: true,
+    product_specific: true,
 
     sdk_version: "14",
     cflags: [