Merge "Move RELEASE_PLATFORM_VERSION_KNOWN_CODENAMES out to release configs." into main (97d0ec9b) · Commits · e / os / android_build

core/version_util.mk

+5 −11

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,7 @@
	# PLATFORM_VNDK_VERSION		# PLATFORM_VNDK_VERSION
	# PLATFORM_SYSTEMSDK_VERSIONS		# PLATFORM_SYSTEMSDK_VERSIONS
	# PLATFORM_VERSION_LAST_STABLE		# PLATFORM_VERSION_LAST_STABLE
			# PLATFORM_VERSION_KNOWN_CODENAMES
	#		#

	# Look for an optional file containing overrides of the defaults,		# Look for an optional file containing overrides of the defaults,
	@@ -95,17 +96,10 @@ endif
	PLATFORM_VERSION_LAST_STABLE := $(RELEASE_PLATFORM_VERSION_LAST_STABLE)		PLATFORM_VERSION_LAST_STABLE := $(RELEASE_PLATFORM_VERSION_LAST_STABLE)
	.KATI_READONLY := PLATFORM_VERSION_LAST_STABLE		.KATI_READONLY := PLATFORM_VERSION_LAST_STABLE

			ifdef PLATFORM_VERSION_KNOWN_CODENAMES
	# This are all known codenames. Should this move into the release config?		$(error Do not set PLATFORM_VERSION_KNOWN_CODENAMES directly. Use RELEASE_PLATFORM_VERSION_KNOWN_CODENAMES. value: $(PLATFORM_VERSION_KNOWN_CODENAMES))
	PLATFORM_VERSION_KNOWN_CODENAMES := \		endif
	Base Base11 Cupcake Donut Eclair Eclair01 EclairMr1 Froyo Gingerbread GingerbreadMr1 \		PLATFORM_VERSION_KNOWN_CODENAMES := $(RELEASE_PLATFORM_VERSION_KNOWN_CODENAMES)
	Honeycomb HoneycombMr1 HoneycombMr2 IceCreamSandwich IceCreamSandwichMr1 \
	JellyBean JellyBeanMr1 JellyBeanMr2 Kitkat KitkatWatch Lollipop LollipopMr1 M N NMr1 O OMr1 P \
	Q R S Sv2 Tiramisu UpsideDownCake VanillaIceCream

	# Convert from space separated list to comma separated
	PLATFORM_VERSION_KNOWN_CODENAMES := \
	$(call normalize-comma-list,$(PLATFORM_VERSION_KNOWN_CODENAMES))
	.KATI_READONLY := PLATFORM_VERSION_KNOWN_CODENAMES		.KATI_READONLY := PLATFORM_VERSION_KNOWN_CODENAMES

	ifndef PLATFORM_VERSION		ifndef PLATFORM_VERSION