openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Setting PLATFORM_VERSION(_CODENAME)? to NMR1" into nyc-mr1-dev am: 22a719477d 

am: 58741e92cf

* commit '58741e92cf0e8173715b70275d63cbb471c91866':
  Setting PLATFORM_VERSION(_CODENAME)? to NMR1

Change-Id: I8b738c9a001dcb159dc14e44add5add464d6379b
This commit is contained in:
Ian Pedowitz 2016-05-12 18:22:31 +00:00 committed by android-build-merger
parent 983342451b 58741e92cf
commit 721a6c0465
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/version_defaults.mk
View File

@ -43,7 +43,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 := N
PLATFORM_VERSION := NMR1
endif
ifeq "" "$(PLATFORM_SDK_VERSION)"
@ -70,12 +70,12 @@ 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 := N
PLATFORM_VERSION_CODENAME := NMR1
# 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
# codenames after PLATFORM_VERSION_CODENAME.
PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME)
PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME),N
endif
ifeq "REL" "$(PLATFORM_VERSION_CODENAME)"