commit c04670b6a342d2f01f120a0201340c326d890076
author Anton Hansson <hansson@google.com> Tue Jan 15 05:47:12 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Jan 15 05:47:12 2019 -0800
tree d9909a0d8695b5dd35a95288d6e081b4506c0f46
parent f89de848f827b6a839c32b1e494538e7cb4d381c
parent 2506e5d317326a1936babfbc7415fdc3941e2d4f

Merge "Move Contacts to /product"
am: 2506e5d317

Change-Id: Ife33eb9ce3ef59b17ff466274de3b780deb238f9

Android.mk

diff --git a/Android.mk b/Android.mk
index 4a6a325..2f177a6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,7 +37,9 @@
 
 LOCAL_PACKAGE_NAME := Contacts
 LOCAL_CERTIFICATE := shared
+LOCAL_PRODUCT_MODULE := true
 LOCAL_PRIVILEGED_MODULE := true
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.contacts
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 63f1939..a9f59cc 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -43,8 +43,8 @@
 #$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
 #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
-
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Contacts_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Contacts)
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Contacts_intermediates)