Merge "Move Dialer to /product"
diff --git a/Android.mk b/Android.mk
index 0eb26e4..eb6798c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -175,7 +175,9 @@
LOCAL_PACKAGE_NAME := Dialer
LOCAL_CERTIFICATE := shared
LOCAL_PRIVILEGED_MODULE := true
+LOCAL_PRODUCT_MODULE := true
LOCAL_USE_AAPT2 := true
+LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.dialer
include $(BUILD_PACKAGE)
diff --git a/CleanSpec.mk b/CleanSpec.mk
index fecdf79..960bd75 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -39,3 +39,4 @@
# ************************************************
$(call add-clean-step, (cd packages/apps/Dialer; git clean -f java/com/android/voicemail/impl/com/google/internal/communications/voicemailtranscription/v1/VoicemailTranscriptionServiceGrpc.java >&2) || true)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Dialer)