From 512ce9cb42ac9c20692bdf16a51d921a6fe504be Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Wed, 25 Jan 2012 11:21:37 -0800 Subject: [PATCH] You know back when I said this thing about Ice Cream Sandwich MR2? What was I thinking? That would be *ridiculous*. What sane person would come up with a release like that?!? I mean... four words! Six if you try to say it! Insane!! Instead, we shall call you: Jelly Bean. Yum. Change-Id: Ice28fc17b7eb77cf6b708958161339890234d1d8 --- CleanSpec.mk | 5 +++++ core/version_defaults.mk | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 5446ce7cc8..1d9b9bb984 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -114,6 +114,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libbcinfo_intermediates) +# WAIT, I MEAN JELLY BEAN!!!!!!!!!!!! +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 8553982264..c97306c0b4 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 := IceCreamSandwichMR2 + PLATFORM_VERSION := JellyBean 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 := IceCreamSandwichMR2 + PLATFORM_VERSION_CODENAME := JellyBean endif ifeq "" "$(DEFAULT_APP_TARGET_SDK)"