diff options
| author | Anton Hansson <hansson@google.com> | 2019-01-14 01:46:05 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-14 01:46:05 -0800 |
| commit | 36f957c902c48ba1973479c8fe6aa50ed50d9fa5 (patch) | |
| tree | c28d1c998fcb57d7f511f0f08455a3fa992ea769 | |
| parent | b00423d4e615887916f3abf068b44e32b94b033e (diff) | |
| parent | c2ed09a133677236191c734f6619275f6c8303fb (diff) | |
| download | Calendar-36f957c902c48ba1973479c8fe6aa50ed50d9fa5.tar.gz | |
Merge "Move Calendar to /product" am: faf91459ac am: 6037344914
am: c2ed09a133
Change-Id: Ic4ec00e37c156fa2c70d9be0c6e06200688a7ec3
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | CleanSpec.mk | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -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 |