Merge "Add P back to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp (b97c97b6) · Commits · e / os / android_build

core/version_defaults.mk

+5 −5

Original line number	Diff line number	Diff line
		@@ -38,9 +38,9 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE
		include $(INTERNAL_BUILD_ID_MAKEFILE)
		endif

		DEFAULT_PLATFORM_VERSION := OPM1
		MIN_PLATFORM_VERSION := OPM1
		MAX_PLATFORM_VERSION := OPM1
		DEFAULT_PLATFORM_VERSION := PPR1
		MIN_PLATFORM_VERSION := PPR1
		MAX_PLATFORM_VERSION := PPR1

		ALLOWED_VERSIONS := $(call allowed-platform-versions,\
		$(MIN_PLATFORM_VERSION),\
		@@ -74,11 +74,11 @@ endif
		# please add that PLATFORM_VERSION as well as clean up obsolete PLATFORM_VERSION's
		# in the following text file:
		# cts/tests/tests/os/assets/platform_versions.txt
		PLATFORM_VERSION.OPM1 := 8.1.0
		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".
		PLATFORM_VERSION_CODENAME.OPM1 := REL
		PLATFORM_VERSION_CODENAME.PPR1 := P

		ifndef PLATFORM_VERSION
		PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))