Merge "Q Branch prefix is QP1A" into qt-dev (71f153e9) · Commits · e / os / android_build

core/envsetup.mk

+5 −3

Original line number	Diff line number	Diff line
		@@ -25,11 +25,13 @@ endef
		#$(warning $(call find_and_earlier,A B C,D))

		define version-list
		$(1)PR1 $(1)PD1 $(1)PD2 $(1)PM1 $(1)PM2
		$(1)P1A $(1)P1B $(1)P2A $(1)P2B $(1)D1A $(1)D1B $(1)D2A $(1)D2B $(1)Q1A $(1)Q1B $(1)Q2A $(1)Q2B $(1)Q3A $(1)Q3B
		endef

		ALL_VERSIONS := O P Q R S T U V W X Y Z
		ALL_VERSIONS := $(foreach v,$(ALL_VERSIONS),$(call version-list,$(v)))
		PREV_VERSIONS := OPR1 OPD1 OPD2 OPM1 OPM2 PPR1 PPD1 PPD2 PPM1 PPM2 QPR1
		ALL_VERSIONS := Q R S T U V W X Y Z
		ALL_VERSIONS := $(PREV_VERSIONS) $(foreach v,$(ALL_VERSIONS),$(call version-list,$(v)))
		PREV_VERSIONS :=

		# Filters ALL_VERSIONS down to the range [$1, $2], and errors if $1 > $2 or $3 is
		# not in [$1, $2]

+5 −5

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

		DEFAULT_PLATFORM_VERSION := QPR1
		MIN_PLATFORM_VERSION := QPR1
		MAX_PLATFORM_VERSION := QPR1
		DEFAULT_PLATFORM_VERSION := QP1A
		MIN_PLATFORM_VERSION := QP1A
		MAX_PLATFORM_VERSION := QP1A

		ALLOWED_VERSIONS := $(call allowed-platform-versions,\
		$(MIN_PLATFORM_VERSION),\
		@@ -89,11 +89,11 @@ MAX_PLATFORM_VERSION :=
		# generate the range of allowed SDK versions, so it must have an entry for every
		# unreleased API level targetable by this branch, not just those that are valid
		# lunch targets for this branch.
		PLATFORM_VERSION.QPR1 := 10
		PLATFORM_VERSION.QP1A := 10

		# 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.QPR1 := Q
		PLATFORM_VERSION_CODENAME.QP1A := Q

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