diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-09-26 00:22:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 00:22:31 +0000 |
| commit | 8ae0f88b787962c1a451a1569ad7dfcffaba5ece (patch) | |
| tree | 2b3bcdcb48ca592cbf4189cda5bf3585493064fc | |
| parent | e9ee28b27c0c64069c52dccadac021be929e3830 (diff) | |
| parent | e105b8f2d3fd57b9f3f8c83f21fc54bc05c3c4f4 (diff) | |
| download | build-8ae0f88b787962c1a451a1569ad7dfcffaba5ece.zip build-8ae0f88b787962c1a451a1569ad7dfcffaba5ece.tar.gz build-8ae0f88b787962c1a451a1569ad7dfcffaba5ece.tar.bz2 | |
am e105b8f2: Merge "And then L, without ever becoming a real code name, transforms like magic to 5.0." into lmp-dev
* commit 'e105b8f2d3fd57b9f3f8c83f21fc54bc05c3c4f4':
And then L, without ever becoming a real code name, transforms like magic to 5.0.
| -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 26d81ff..07b3ece 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -297,6 +297,11 @@ $(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/*) +# 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 ea10f2a..8cb8d26 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 := L + PLATFORM_VERSION := 5.0 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 := L + PLATFORM_VERSION_CODENAME := REL # 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 |