diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-11-02 11:38:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-02 11:38:37 -0700 |
| commit | 1b601a447247bcc373d417d7be4c89c1e6216b89 (patch) | |
| tree | cc463a1802f6a8f6a9656e57617af43f46e8f18c | |
| parent | 3bd8e467d7cd40c20f95fbf50de8f926ba301cb3 (diff) | |
| parent | b32faad390eb8a865b0ea2b18fdfa9b87c4ff689 (diff) | |
| download | build-1b601a447247bcc373d417d7be4c89c1e6216b89.zip build-1b601a447247bcc373d417d7be4c89c1e6216b89.tar.gz build-1b601a447247bcc373d417d7be4c89c1e6216b89.tar.bz2 | |
Merge "MR1 is version 4.1, API 15." into ics-mr1
| -rw-r--r-- | CleanSpec.mk | 4 | ||||
| -rw-r--r-- | core/version_defaults.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 62a3a09..ffe106c 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 6773635..7f6db0c 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)" |