From 9b81c29acc04497a3202d304829cd61616fdf1ba Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Sun, 13 Mar 2022 21:17:02 +0200
Subject: [PATCH] config: Make use of LINEAGE_VERSION_APPEND_TIME_OF_DAY
 consistent

Change-Id: I9cd0aaa205663e44614e07318ca66c3e0aba7c8e
---
 config/version.mk | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/config/version.mk b/config/version.mk
index ed9eb2c4..6ad729a9 100644
--- a/config/version.mk
+++ b/config/version.mk
@@ -1,6 +1,12 @@
 PRODUCT_VERSION_MAJOR = 19
 PRODUCT_VERSION_MINOR = 1
 
+ifeq ($(LINEAGE_VERSION_APPEND_TIME_OF_DAY),true)
+    LINEAGE_BUILD_DATE := $(shell date -u +%Y%m%d_%H%M%S)
+else
+    LINEAGE_BUILD_DATE := $(shell date -u +%Y%m%d)
+endif
+
 # Set LINEAGE_BUILDTYPE from the env RELEASE_TYPE, for jenkins compat
 
 ifndef LINEAGE_BUILDTYPE
@@ -52,11 +58,7 @@ endif
 ifeq ($(LINEAGE_BUILDTYPE), RELEASE)
     LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR).$(PRODUCT_VERSION_DEVICE_SPECIFIC)-$(LINEAGE_BUILD)
 else
-    ifeq ($(LINEAGE_VERSION_APPEND_TIME_OF_DAY),true)
-        LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(shell date -u +%Y%m%d_%H%M%S)-$(LINEAGE_BUILDTYPE)$(LINEAGE_EXTRAVERSION)-$(LINEAGE_BUILD)
-    else
-        LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(shell date -u +%Y%m%d)-$(LINEAGE_BUILDTYPE)$(LINEAGE_EXTRAVERSION)-$(LINEAGE_BUILD)
-    endif
+    LINEAGE_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(LINEAGE_BUILD_DATE)-$(LINEAGE_BUILDTYPE)$(LINEAGE_EXTRAVERSION)-$(LINEAGE_BUILD)
 endif
 
 # Display version
@@ -70,7 +72,7 @@ ifneq ($(PRODUCT_DEFAULT_DEV_CERTIFICATE),build/target/product/security/testkey)
             LINEAGE_EXTRAVERSION := $(shell echo $(LINEAGE_EXTRAVERSION) | sed 's/-//')
             TARGET_VENDOR_RELEASE_BUILD_ID := $(LINEAGE_EXTRAVERSION)
         else
-            TARGET_VENDOR_RELEASE_BUILD_ID := $(shell date -u +%Y%m%d)
+            TARGET_VENDOR_RELEASE_BUILD_ID := $(LINEAGE_BUILD_DATE)
         endif
         LINEAGE_DISPLAY_VERSION := $(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_VENDOR_RELEASE_BUILD_ID)-$(LINEAGE_BUILD)
     endif