commit 0a399bf543115029e5bc998c626aef8bbc320a9c
author Anton Hansson <hansson@google.com> Mon Jan 14 09:06:25 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 14 09:06:25 2019 +0000
tree 9704172e7eecc46347d13685e7f96adf630dc7bd
parent 7588ef1518ff6eb874cf78f8ea7f94e7d5b72e88
parent 9a7786b3e11f626c08c99691dd0cb718de4267da

Merge "Move Settings app to /product"

Android.mk

diff --git a/Android.mk b/Android.mk
index b54b376..02b9adc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,6 +14,7 @@
 LOCAL_PACKAGE_NAME := Settings
 LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_CERTIFICATE := platform
+LOCAL_PRODUCT_MODULE := true
 LOCAL_PRIVILEGED_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_USE_AAPT2 := true

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 6ead46e..93445f9 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -46,6 +46,7 @@
 
 $(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)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST