Merge "PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4" into nyc-dev am: 77df46efec
am: 4df6466c0d
* commit '4df6466c0df4ce5caa3de49171c376da408e4044':
PLATFORM_PREVIEW_SDK_VERSION == 4 for DP4
Change-Id: I7e0631ed3194dd9889df1752c6de259af5516583
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 363a0d4..a858c19 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 := N
+ PLATFORM_VERSION := NMR1
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 := 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)"