diff options
author | Dianne Hackborn <hackbod@google.com> | 2014-06-12 11:34:48 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2014-06-12 11:34:48 -0700 |
commit | dd0afa03f20c3aab7a4337b8a72a4b6214d3446f (patch) | |
tree | 0bc3920f368db4e6bc80b2c392117d93f1b3ee94 | |
parent | 04d0f5f3ab844b1d6f14ff67398384faff54ed5b (diff) | |
parent | 0c651756f03382d391cec8611596d865b79a565c (diff) | |
download | build-dd0afa03f20c3aab7a4337b8a72a4b6214d3446f.zip build-dd0afa03f20c3aab7a4337b8a72a4b6214d3446f.tar.gz build-dd0afa03f20c3aab7a4337b8a72a4b6214d3446f.tar.bz2 |
resolved conflicts for merge of 0c651756 to master
Change-Id: Ifd66a3daa792f88ac2db0c24a11962d445e8f22d
-rw-r--r-- | CleanSpec.mk | 5 | ||||
-rw-r--r-- | core/version_defaults.mk | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index a9f1aa3..a967412 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -265,6 +265,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) # Switching to 32-bit-by-default host multilib build $(call add-clean-step, rm -rf $(HOST_OUT_INTERMEDIATES)) +# KKWT has become API 20 +$(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/*) + # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 432391f..31c3242 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -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 := 19 + PLATFORM_SDK_VERSION := 20 endif ifeq "" "$(PLATFORM_VERSION_CODENAME)" @@ -64,7 +64,7 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)" # This is all of the development codenames that are active. Should be either # the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional # codenames after PLATFORM_VERSION_CODENAME. - PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME),KKWT + PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME) endif ifeq "" "$(DEFAULT_APP_TARGET_SDK)" |