diff options
author | Anton Hansson <hansson@google.com> | 2019-02-04 04:35:32 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-02-04 04:35:32 -0800 |
commit | bea3474a93a06367f617744b7767a2cd9ad85892 (patch) | |
tree | 08728e829ecb575f3d0da0c308d8acdde73242d4 | |
parent | 01d19af44d06cf145ee894dfaa2b1d2505322eed (diff) | |
parent | 2a96c802aa0d8d5fb66971ecb4808abfd8bf8b34 (diff) |
Merge "Move Dialer to /product"
am: 2a96c802aa
Change-Id: Ifd9e13d150cf3739583f25ef35d802296d966f02
-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) |