resolve merge conflicts of be9844a03c to oc-dev-plus-aosp
Change-Id: If7d78718d8f6349b9b386c30096bd83d8f94cbc9
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index f6a9077..656d57e 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -79,10 +79,11 @@
# 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.OPR1 := 8.0.0
-# These are the current development codenames.
-PLATFORM_VERSION_CODENAME.OPR1 := O
+# 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.OPR1 := REL
ifndef PLATFORM_VERSION
PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))
@@ -162,7 +163,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 := 0
endif
endif