From: Ian Pedowitz <ijpedowitz@google.com>
Date: Thu, 23 Jun 2016 19:09:22 +0000 (+0000)
Subject: Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=091fa1edc91a45413650c7243f16d2aa82e1f61f;p=android-x86%2Fbuild.git

Revert "Revert "Removing N from PLATFORM_VERSION_ALL_CODENAMES""

This reverts commit dc15ebc26cbf88dcba74aea1f005a1794c779ee6.

Fixes: 29117805
Bug: 28809789
Change-Id: I52ff3d0450928bfdc3035c1e9991741c7bcf14d0
---

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index dbfa90afa..596e4da95 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -75,7 +75,7 @@ ifeq "" "$(PLATFORM_VERSION_CODENAME)"
   # 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),NMR1,N
+  PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME),NMR1
 endif
 
 ifeq "REL" "$(PLATFORM_VERSION_CODENAME)"