From 105df2f1d2882f6c49f0619c7c46b05d52a2e07a Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Mon, 22 Sep 2014 15:55:23 -0700 Subject: [PATCH] And then L, without ever becoming a real code name, transforms like magic to 5.0. The code name looked at 5.0 despondently. "Won't anyone care about me? Why does everyone pretend like I don't even exist!" And it was true -- for all of its life, nobody had ever whispered L's true name, at least not in the same breath as many other names that were not L's at all. But 5.0 knew better. "L," the number said, "don't you fear. Some day, I am sure, your name will go up in lights. Your name will shine brighter than even my own. And everyone who is anyone will know your name, write pages and pages all about your name, and debate endlessly about everything you are." L could only hope this would be true. But not today. Today, L is still nobody. Change-Id: I2523dd34ff7486badf8c9cd40e43833a5ef448b8 --- CleanSpec.mk | 5 +++++ core/version_defaults.mk | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CleanSpec.mk b/CleanSpec.mk index 025edb044..f348692dd 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 ea10f2a01..8cb8d2626 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