Merge branch 'oreo-display-release-type-but-keep-lineage-keys' into 'v1-oreo' (9fd6ed76) · Commits · e / os / android_build

core/Makefile

+10 −6

Original line number	Original line	Diff line number	Diff line
	@@ -173,12 +173,16 @@ BUILD_KEYS := dev-keys
	endif		endif

	ifndef RELEASE_TYPE		ifndef RELEASE_TYPE
	BUILD_DISPLAY_KEYS := $(BUILD_KEYS)		ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/make/target/product/security/testkey)
			BUILD_RELEASE_TYPE := test-release
	else		else
	BUILD_DISPLAY_KEYS := $(RELEASE_TYPE)-keys		BUILD_RELEASE_TYPE := unknown-release
	endif		endif
			else
	BUILD_VERSION_TAGS += $(BUILD_DISPLAY_KEYS)		BUILD_RELEASE_TYPE := $(RELEASE_TYPE)-release
			endif
			BUILD_VERSION_TAGS += $(BUILD_KEYS)
			BUILD_VERSION_TAGS += $(BUILD_RELEASE_TYPE)
	BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS)))		BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS)))

	# A human-readable string that descibes this build in detail.		# A human-readable string that descibes this build in detail.
	@@ -226,9 +230,9 @@ ifeq ($(TARGET_BUILD_VARIANT),user)

	# Dev. branches should have DISPLAY_BUILD_NUMBER set		# Dev. branches should have DISPLAY_BUILD_NUMBER set
	ifeq (true,$(DISPLAY_BUILD_NUMBER))		ifeq (true,$(DISPLAY_BUILD_NUMBER))
	BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) $(BUILD_DISPLAY_KEYS)		BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) $(BUILD_KEYS) $(BUILD_RELEASE_TYPE)
	else		else
	BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_DISPLAY_KEYS)		BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_KEYS) $(BUILD_RELEASE_TYPE)
	endif		endif
	else		else
	# Non-user builds should show detailed build information		# Non-user builds should show detailed build information