Commit 2e6eef7d authored by Romain Hunault's avatar Romain Hunault
Browse files

Merge branch 'nougat-display-release-type-but-keep-lineage-keys' into 'v1-nougat'

Nougat display release type but keep lineage keys

See merge request !20
parents 8207190e 539e9b3d
......@@ -125,12 +125,16 @@ BUILD_KEYS := dev-keys
endif
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
BUILD_DISPLAY_KEYS := $(RELEASE_TYPE)-keys
BUILD_RELEASE_TYPE := unknown-release
endif
BUILD_VERSION_TAGS += $(BUILD_DISPLAY_KEYS)
else
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)))
# If the final fingerprint should be different than what was used by the build system,
......@@ -195,9 +199,9 @@ ifeq ($(TARGET_BUILD_VARIANT),user)
# Dev. branches should have DISPLAY_BUILD_NUMBER set
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
BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_DISPLAY_KEYS)
BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_KEYS) $(BUILD_RELEASE_TYPE)
endif
else
# Non-user builds should show detailed build information
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment