summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2011-09-14 11:03:40 -0700
committer Dianne Hackborn <hackbod@google.com> 2011-09-14 13:52:02 -0700
commit4d7ddab160ba29247225e11c2092dcfd68bd6baf (patch)
treea36ff3099236b373e2ad0ea14b8b93ac821b1743
parent3899d3ec563409b023eebc594354c5b0b7b8e6a6 (diff)
Hello, Android 4.0.
Change-Id: I0d775bc81e1fb1c3ca0151b15a582035109dc5b5
-rw-r--r--CleanSpec.mk7
-rw-r--r--core/version_defaults.mk6
2 files changed, 10 insertions, 3 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 70a053f5ce..5240837276 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -96,6 +96,13 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/librtp_jni_intermediates)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/android-info.txt)
+$(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)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/JAVA_LIBRARIES/*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*)
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 986dac944a..15176b97de 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 := IceCreamSandwich
+ PLATFORM_VERSION := 4.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 := 13
+ PLATFORM_SDK_VERSION := 14
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 := IceCreamSandwich
+ PLATFORM_VERSION_CODENAME := REL
endif
ifeq "" "$(DEFAULT_APP_TARGET_SDK)"