From 80cbcc48d3b12d9f3501a0d0a7b24f0d0edbc6ee Mon Sep 17 00:00:00 2001 From: Bart Sears Date: Thu, 14 May 2015 22:04:41 -0700 Subject: [PATCH] Master has moved on Change master so it no longer thinks it is building MNC. Change-Id: I0b68e78d02b7ceadbef0ca95fc74d20d31076881 --- CleanSpec.mk | 5 +++++ core/version_defaults.mk | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 74e7c43e27..cc42a3b14a 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -354,6 +354,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop) +# New York, New York! +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index c36d69087c..01bae4aa83 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)" # which is the version that we reveal to the end user. # Update this value when the platform version changes (rather # than overriding it somewhere else). Can be an arbitrary string. - PLATFORM_VERSION := MNC + PLATFORM_VERSION := NYC endif ifeq "" "$(PLATFORM_SDK_VERSION)" @@ -59,7 +59,7 @@ endif ifeq "" "$(PLATFORM_VERSION_CODENAME)" # This is the current development code-name, if the build is not a final # release build. If this is a final release build, it is simply "REL". - PLATFORM_VERSION_CODENAME := MNC + PLATFORM_VERSION_CODENAME := NYC # This is all of the development codenames that are active. Should be either # the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional