diff options
| author | Anton Hansson <hansson@google.com> | 2019-02-04 21:44:25 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-04 21:44:25 -0800 |
| commit | e1b7b8c62a67831f2c0f62036d25766df311f46c (patch) | |
| tree | 08728e829ecb575f3d0da0c308d8acdde73242d4 | |
| parent | 58b69e4f1a06d012671203974bf9677ca6b15fa8 (diff) | |
| parent | f146187989e6872dd5c9515ecc093546a969fa5e (diff) | |
Merge "Move Dialer to /product" am: 2a96c802aa am: bea3474a93
am: f146187989
Change-Id: Ibc2f1ea4716af52be769c98d2f4da816de0459c8
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | CleanSpec.mk | 1 |
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) |