summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2019-02-04 21:22:23 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-02-04 21:22:23 -0800
commitf146187989e6872dd5c9515ecc093546a969fa5e (patch)
tree08728e829ecb575f3d0da0c308d8acdde73242d4
parent46b23215b9f2c075ae2617fa17d488ccf38fbe04 (diff)
parentbea3474a93a06367f617744b7767a2cd9ad85892 (diff)
Merge "Move Dialer to /product" am: 2a96c802aa
am: bea3474a93 Change-Id: I6ac8c5bcb6578a5d2c1b1585d25344b2880640dd
-rw-r--r--Android.mk2
-rw-r--r--CleanSpec.mk1
2 files changed, 3 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 0eb26e424..eb6798cb7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -175,7 +175,9 @@ LOCAL_MODULE_TAGS := optional
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 fecdf7929..960bd75ad 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)