Merge "Specialize oc-dev into OPR1" into oc-dev (b70a9346) · Commits · e / os / android_build

core/version_defaults.mk

+1 −3

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ endif

		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,12 +74,10 @@ endif
		# 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

		# 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 := O
		PLATFORM_VERSION_CODENAME.PPR1 := P

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