commit 8a5d527223414c3c23b8021eb8ed468d3299e968
author android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> Wed Oct 28 16:12:11 2009 -0700
committer android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> Wed Oct 28 16:12:11 2009 -0700
tree c05aafc2a745302dfb5e66b0a57858f30381d98a
parent eae4fc960cec88f50eea7ae65f85f5722b0ad26b
parent 3fa115999c8512095301724f557821f25ddfe08f

resolved conflicts for merge of 3fa11599 to eclair-mr2

cleanspec.mk

diff --git a/cleanspec.mk b/cleanspec.mk
index 1146ebb..ba85378 100644
--- a/cleanspec.mk
+++ b/cleanspec.mk
@@ -99,6 +99,10 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libwebcore_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates)
+$(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 $(OUT_DIR)/target/common/obj/APPS)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 91755c9..f10b331 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -41,7 +41,7 @@
   # 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 := 2.0
+  PLATFORM_VERSION := 2.1
 endif
 
 ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -53,7 +53,7 @@
   # 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 := 5
+  PLATFORM_SDK_VERSION := 6
 endif
 
 ifeq "" "$(PLATFORM_VERSION_CODENAME)"