commit c8e4d7953e83c1f07d72ce573dce8c34c316428c
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 17 11:44:42 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 17 11:44:42 2020 +0000
tree ed5f3d21f2da4b7e1617515fb65420fa0fc87435
parent 6f82fe83f0c3cd6823dbaea89be61b72c33d8e6f
parent 13aaa6ab4e187d6efa7505c558105f016136e60c

Merge "Move the app to /system_ext"

Android.bp

diff --git a/Android.bp b/Android.bp
index fb1a802..ce6a1b4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,7 +49,7 @@
     name: "Settings",
     platform_apis: true,
     certificate: "platform",
-    product_specific: true,
+    system_ext_specific: true,
     privileged: true,
     required: ["privapp_whitelist_com.android.settings"],
     static_libs: ["Settings-core"],

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 93445f9..dd61019 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -47,6 +47,8 @@
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Settings_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Settings_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Settings)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/priv-app/Settings)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/priv-app/Settings)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST