diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-09-25 00:28:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-25 00:28:33 +0000 |
| commit | e105b8f2d3fd57b9f3f8c83f21fc54bc05c3c4f4 (patch) | |
| tree | ded78b2d61be83c9f337d200f1102331ce53ca0d | |
| parent | a47420a22d83fb5707cb971d98961f87e667ffe8 (diff) | |
| parent | 105df2f1d2882f6c49f0619c7c46b05d52a2e07a (diff) | |
| download | build-e105b8f2d3fd57b9f3f8c83f21fc54bc05c3c4f4.zip build-e105b8f2d3fd57b9f3f8c83f21fc54bc05c3c4f4.tar.gz build-e105b8f2d3fd57b9f3f8c83f21fc54bc05c3c4f4.tar.bz2 | |
Merge "And then L, without ever becoming a real code name, transforms like magic to 5.0." into lmp-dev
| -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 025edb0..f348692 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -294,6 +294,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 |