commit 0b1de05d3c63cbe99d07f48b2a255970a28629c2
author Colin Cross <ccross@android.com> Sat Apr 08 02:13:51 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Apr 08 02:13:51 2017 +0000
tree e6f5b98b0988aa108cececc85051d8c2b71c333f
parent 864955d152083e63b5c6904e41de56b8c05c8f59
parent b70a93465a67c836333fce03148daae99d053976

Merge "Specialize oc-dev into OPR1" into oc-dev
am: b70a93465a

Change-Id: I488e308e863e7ea8ddbfe6f4d1a0588ebec016d5

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index ad8561d..41e220f 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -40,7 +40,7 @@
 
 DEFAULT_PLATFORM_VERSION := OPR1
 MIN_PLATFORM_VERSION := OPR1
-MAX_PLATFORM_VERSION := PPR1
+MAX_PLATFORM_VERSION := OPR1
 
 ALLOWED_VERSIONS := $(call allowed-platform-versions,\
   $(MIN_PLATFORM_VERSION),\
@@ -74,11 +74,9 @@
 # please add that PLATFORM_VERSION to the following text file:
 # cts/tests/tests/os/assets/platform_versions.txt
 PLATFORM_VERSION.OPR1 := O
-PLATFORM_VERSION.PPR1 := P
 
 # These are the current development codenames.
 PLATFORM_VERSION_CODENAME.OPR1 := O
-PLATFORM_VERSION_CODENAME.PPR1 := P
 
 ifndef PLATFORM_VERSION
   PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))