From 2ac00864a7cdde803e356fdd83e82d0c6889d6c4 Mon Sep 17 00:00:00 2001
From: Alexandre Roux D'Anzi <alexandre.roux.danzi@lostpod.me>
Date: Mon, 14 Dec 2020 10:04:17 +0100
Subject: [PATCH 1/2] display release type but keep lineage-keys

---
 core/Makefile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index dd56a43578..751857f3e3 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -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 := dev-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
-- 
GitLab


From d4eb85bf6328f4abc72e3cc1497b0cf3cf91bb8b Mon Sep 17 00:00:00 2001
From: Alexandre Roux <alexandre.roux.danzi@lostpod.me>
Date: Mon, 14 Dec 2020 17:36:50 +0000
Subject: [PATCH 2/2] display unknown-release instead of dev when using unknown
 key

---
 core/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/Makefile b/core/Makefile
index 751857f3e3..03a265d009 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -128,7 +128,7 @@ ifndef RELEASE_TYPE
 ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/make/target/product/security/testkey)
 BUILD_RELEASE_TYPE := test-release
 else
-BUILD_RELEASE_TYPE := dev-release
+BUILD_RELEASE_TYPE := unknown-release
 endif
 else
 BUILD_RELEASE_TYPE := $(RELEASE_TYPE)-release
-- 
GitLab