Revert "Revert "master is now OPD1/ODR by default and adding OPM1/OMR1""
This reverts commit d9c3fd1d559072fa83d21f4aa258741ce69b818c.
Bug: 37201939
Fixes: 37212091
Change-Id: I7894321971c0b696594deb064ebed3f43cf7c8d1
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 324fd24..4135ac8 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -38,8 +38,8 @@
include $(INTERNAL_BUILD_ID_MAKEFILE)
endif
-DEFAULT_PLATFORM_VERSION := OPR1
-MIN_PLATFORM_VERSION := OPR1
+DEFAULT_PLATFORM_VERSION := OPD1
+MIN_PLATFORM_VERSION := OPD1
MAX_PLATFORM_VERSION := PPR1
ALLOWED_VERSIONS := $(call allowed-platform-versions,\
@@ -79,11 +79,15 @@
# When you change PLATFORM_VERSION for a given PLATFORM_SDK_VERSION
# 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.
+# 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".
PLATFORM_VERSION_CODENAME.OPR1 := O
+PLATFORM_VERSION_CODENAME.OPD1 := ODR
+PLATFORM_VERSION_CODENAME.OPM1 := OMR1
PLATFORM_VERSION_CODENAME.PPR1 := P
ifndef PLATFORM_VERSION
@@ -164,7 +168,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 := 2
+ PLATFORM_PREVIEW_SDK_VERSION := 1
endif
endif
