summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2019-01-11 14:46:37 +0000
committerAnton Hansson <hansson@google.com>2019-01-11 14:46:37 +0000
commitc81ccc6811e823024248f6c6fe33c8ec6c371708 (patch)
tree2b9de976eb475d54124cc7479bfead61330dd874
parent0bd5cedb0dab02419e0d0b84ce8cec6ba33d7dc7 (diff)
downloadCalendar-c81ccc6811e823024248f6c6fe33c8ec6c371708.tar.gz
Move Calendar to /product
This app is frequently overriden by proprietary apps on shipping devices, so move it to /product. Bug: 122353713 Test: launch calendar on aosp_arm64 emulator Change-Id: I52e96b5eca097e8d075b771b5d4d0d7f0ba0be08
-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 656f3847..5c510f35 100644
--- a/Android.mk
+++ b/Android.mk
@@ -40,6 +40,8 @@ LOCAL_PACKAGE_NAME := Calendar
LOCAL_PROGUARD_FLAG_FILES := proguard.flags \
../../../frameworks/opt/datetimepicker/proguard.flags
+LOCAL_PRODUCT_MODULE := true
+
LOCAL_AAPT_FLAGS := --auto-add-overlay
LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips
LOCAL_AAPT_FLAGS += --extra-packages com.android.colorpicker
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b921e716..ba9ebcff 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -44,6 +44,7 @@
#$(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)/out/target/common/obj/APPS/Calendar_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Calendar)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST