Commit 537d8d5a authored by Alexandre Roux's avatar Alexandre Roux
Browse files

display release type instead of keys

parent aa5ef1ee
......@@ -123,7 +123,14 @@ BUILD_KEYS := test-keys
else
BUILD_KEYS := dev-keys
endif
BUILD_VERSION_TAGS += $(BUILD_KEYS)
ifndef RELEASE_TYPE
BUILD_DISPLAY_KEYS := $(BUILD_KEYS)
else
BUILD_DISPLAY_KEYS := $(RELEASE_TYPE)-keys
endif
BUILD_VERSION_TAGS += $(BUILD_DISPLAY_KEYS)
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,
......@@ -188,9 +195,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_KEYS)
BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) $(BUILD_DISPLAY_KEYS)
else
BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_KEYS)
BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_DISPLAY_KEYS)
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