From 301d87850ed543b4cbc83f1f47ceda32738382b5 Mon Sep 17 00:00:00 2001 From: Ian Pedowitz Date: Wed, 18 May 2016 22:06:51 +0000 Subject: [PATCH] Revert "Setting PLATFORM_VERSION(_CODENAME)? to O for master" This reverts commit 1a737095c1d2e0224b45f4a4757d549f8142cd4a. Bug: 28713307 Bug: 28767393 Change-Id: I355e7e6b9c785f7ca92d13eea7730449cfe80653 --- core/version_defaults.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index a37318da8..a858c19fa 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -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 := O + 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 := O + 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),N,NMR1 + PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME),N endif ifeq "REL" "$(PLATFORM_VERSION_CODENAME)" @@ -91,7 +91,7 @@ else # assuming the device can only support APIs as of the previous official # public release. # This value will always be 0 for release builds. - PLATFORM_PREVIEW_SDK_VERSION := 1 + PLATFORM_PREVIEW_SDK_VERSION := 4 endif endif