diff options
author | Dianne Hackborn <hackbod@google.com> | 2014-08-26 21:16:47 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-26 21:16:47 +0000 |
commit | 54256fd45cc041acf59dbe812f2d51bce4b5b091 (patch) | |
tree | 10f346d79221ad34b97eaa5d13aad15663dd27cd | |
parent | caec135f4ad2b4461f1ae025d73bb975173162bd (diff) | |
parent | e4584a412960e18709953eee942bceaa85b100f8 (diff) | |
download | build-54256fd45cc041acf59dbe812f2d51bce4b5b091.zip build-54256fd45cc041acf59dbe812f2d51bce4b5b091.tar.gz build-54256fd45cc041acf59dbe812f2d51bce4b5b091.tar.bz2 |
am e4584a41: Merge "Shhhhhhh!!!" into lmp-dev
* commit 'e4584a412960e18709953eee942bceaa85b100f8':
Shhhhhhh!!!
-rw-r--r-- | CleanSpec.mk | 5 | ||||
-rw-r--r-- | core/version_defaults.mk | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 9ff0fb6..26d81ff 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -292,6 +292,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop) +# API 21? +$(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 31c3242..ea10f2a 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 := 20 + PLATFORM_SDK_VERSION := 21 endif ifeq "" "$(PLATFORM_VERSION_CODENAME)" |