From 3742983d3becfa141557d9f5b461c8d39e9d31c0 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Wed, 9 May 2012 22:14:37 -0700 Subject: [PATCH] JellyBean is now 4.1. Change-Id: Ibf2d17e704a01d648e6c9fef774e9806e5e97b9f --- CleanSpec.mk | 5 +++++ core/version_defaults.mk | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 481829a99..b1b139a31 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -122,6 +122,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) # Changing where ro.carrier value is instantiated for system/build.prop $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/app/*) +$(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 c97306c0b..021617d1c 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 := JellyBean + PLATFORM_VERSION := 4.1 endif ifeq "" "$(PLATFORM_SDK_VERSION)" @@ -53,13 +53,13 @@ ifeq "" "$(PLATFORM_SDK_VERSION)" # intermediate builds). During development, this number remains at the # SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds # the code-name of the new development work. - PLATFORM_SDK_VERSION := 15 + PLATFORM_SDK_VERSION := 16 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 := JellyBean + PLATFORM_VERSION_CODENAME := REL endif ifeq "" "$(DEFAULT_APP_TARGET_SDK)" -- 2.11.0