Revert "master is now OPD1/ODR by default and adding OPM1/OMR1"
This reverts commit 9af3fa123c6e3347acea4657cb4969b421618c3a.
Bug: 37201939
Test: Build, load and ensure that hidden menu can be launched
Change-Id: I1641cb528883f912a8051c7660e2750985bafae8
(cherry picked from commit d9c3fd1d559072fa83d21f4aa258741ce69b818c)
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index b03b45a..ad8561d 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -38,8 +38,8 @@
include $(INTERNAL_BUILD_ID_MAKEFILE)
endif
-DEFAULT_PLATFORM_VERSION := OPD1
-MIN_PLATFORM_VERSION := OPD1
+DEFAULT_PLATFORM_VERSION := OPR1
+MIN_PLATFORM_VERSION := OPR1
MAX_PLATFORM_VERSION := PPR1
ALLOWED_VERSIONS := $(call allowed-platform-versions,\
@@ -74,15 +74,10 @@
# please add that PLATFORM_VERSION to the following text file:
# cts/tests/tests/os/assets/platform_versions.txt
PLATFORM_VERSION.OPR1 := O
-PLATFORM_VERSION.OPD1 := ODR
-PLATFORM_VERSION.OPM1 := OMR1
PLATFORM_VERSION.PPR1 := P
-# These are the current development codenames, if the build is not a final
-# release build. If this is a final release build, it is simply "REL".
+# These are the current development codenames.
PLATFORM_VERSION_CODENAME.OPR1 := O
-PLATFORM_VERSION_CODENAME.OPD1 := ODR
-PLATFORM_VERSION_CODENAME.OPM1 := OMR1
PLATFORM_VERSION_CODENAME.PPR1 := P
ifndef PLATFORM_VERSION
@@ -163,7 +158,7 @@
# 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 := 2
endif
endif
