Merge "Update PLATFORM_VERSION to UP1A" (62bf0d5c) · Commits · e / os / android_build

core/version_defaults.mk

+4 −3

Original line number	Diff line number	Diff line
		@@ -40,10 +40,10 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE
		include $(INTERNAL_BUILD_ID_MAKEFILE)
		endif

		DEFAULT_PLATFORM_VERSION := TP1A
		DEFAULT_PLATFORM_VERSION := UP1A
		.KATI_READONLY := DEFAULT_PLATFORM_VERSION
		MIN_PLATFORM_VERSION := TP1A
		MAX_PLATFORM_VERSION := TP1A
		MAX_PLATFORM_VERSION := UP1A

		# The last stable version name of the platform that was released. During
		# development, this stays at that previous version, while the codename indicates
		@@ -54,6 +54,7 @@ PLATFORM_VERSION_LAST_STABLE := 12
		# 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.TP1A := Tiramisu
		PLATFORM_VERSION_CODENAME.UP1A := UpsideDownCake

		# This is the user-visible version. In a final release build it should
		# be empty to use PLATFORM_VERSION as the user-visible version. For
		@@ -90,7 +91,7 @@ PLATFORM_VERSION_KNOWN_CODENAMES := \
		Base Base11 Cupcake Donut Eclair Eclair01 EclairMr1 Froyo Gingerbread GingerbreadMr1 \
		Honeycomb HoneycombMr1 HoneycombMr2 IceCreamSandwich IceCreamSandwichMr1 \
		JellyBean JellyBeanMr1 JellyBeanMr2 Kitkat KitkatWatch Lollipop LollipopMr1 M N NMr1 O OMr1 P \
		Q R S Sv2 Tiramisu
		Q R S Sv2 Tiramisu UpsideDownCake

		# Convert from space separated list to comma separated
		PLATFORM_VERSION_KNOWN_CODENAMES := \