Merge "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"" into nyc-mr1-dev
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index cc602eb..2d37850 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -43,7 +43,7 @@
# 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 := NMR1
+ PLATFORM_VERSION := N
endif
ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -70,12 +70,12 @@
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 := NMR1
+ PLATFORM_VERSION_CODENAME := N
# 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),N
+ PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME)
endif
ifeq "REL" "$(PLATFORM_VERSION_CODENAME)"