From 733ce0d0cc0431d254eea11a044210dc24b11e08 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Sun, 23 Jan 2011 14:49:02 -0800 Subject: [PATCH] DO NOT MERGE. Hello, Android 3.0 API 11. Change-Id: Id859b752fc87fd050005c32665f2f019e177cf95 --- CleanSpec.mk | 3 +++ core/version_defaults.mk | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 6d6dd5bf5..4d509370a 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -65,6 +65,9 @@ $(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/*/LINKED) $(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/build.prop) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 8feff2b69..8bd5a0f9e 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 := Honeycomb + PLATFORM_VERSION := 3.0 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 := 10 + PLATFORM_SDK_VERSION := 11 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 := Honeycomb + PLATFORM_VERSION_CODENAME := REL endif ifeq "" "$(DEFAULT_APP_TARGET_SDK)" -- 2.11.0