p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Dianne Hackborn 2014-09-25 00:40:56 +00:00 committed by Android Git Automerger
parent 1b2c472579 e105b8f2d3
commit a0fdca5e79
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CleanSpec.mk
View File

@ -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
# ************************************************

4
core/version_defaults.mk
View File

@ -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