summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-05-09 18:21:14 -0700
committerDianne Hackborn <hackbod@google.com>2011-05-09 18:21:14 -0700
commit22b5d62172f1563a2513dea314c037703cddf217 (patch)
treefc35f974686ed87d1f81fbdd022e514119937109
parent2218c027117b10fd909083c8c666bebb074c2167 (diff)
downloadbuild-22b5d62172f1563a2513dea314c037703cddf217.zip
build-22b5d62172f1563a2513dea314c037703cddf217.tar.gz
build-22b5d62172f1563a2513dea314c037703cddf217.tar.bz2
DO NOT MERGE. We are now dev branch for Honeycomb MR2.
Change-Id: Icde20a70a35fc28e168eba4809c1c011ac5265b4
-rw-r--r--CleanSpec.mk3
-rw-r--r--core/version_defaults.mk4
2 files changed, 5 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 5002de8..5be23e0 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -71,6 +71,9 @@ $(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)/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)/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 04d5330..76ab0fc 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 := 3.1
+ PLATFORM_VERSION := HoneycombMR2
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 := REL
+ PLATFORM_VERSION_CODENAME := HoneycombMR2
endif
ifeq "" "$(DEFAULT_APP_TARGET_SDK)"