From b32faad390eb8a865b0ea2b18fdfa9b87c4ff689 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Tue, 1 Nov 2011 18:15:57 -0700 Subject: [PATCH] MR1 is version 4.1, API 15. Change-Id: I5f31630b17121ce43b3c60d43409069640e4d97a --- CleanSpec.mk | 4 ++++ core/version_defaults.mk | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 62a3a095e..ffe106ce5 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -103,6 +103,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/JAVA_LIBRARIES/*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*) $(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/*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libbcinfo_intermediates) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 677363577..7f6db0cad 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 := 4.0.1 + PLATFORM_VERSION := 4.1 endif ifeq "" "$(PLATFORM_SDK_VERSION)" @@ -53,7 +53,7 @@ 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 := 14 + PLATFORM_SDK_VERSION := 15 endif ifeq "" "$(PLATFORM_VERSION_CODENAME)" -- 2.11.0