From a618737e9ba67e5c5c6c8821d03731f69be21026 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 30 Oct 2024 19:45:19 +0200 Subject: [PATCH] Conditionally use Unix epoch time for build incremental Incremental version is used in various places to invalidate caches. Setting BUILD_NUMBER directly causes unnecessary rebuilds due to environment variable changes, so simply set it to Unix epoch unless BUILD_NUMBER is explicitly set. Change-Id: Id590df48ae1b73b63039f185644103d66a4bbbb3 --- core/sysprop.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/sysprop.mk b/core/sysprop.mk index 1c2495d74f..e7a140a84c 100644 --- a/core/sysprop.mk +++ b/core/sysprop.mk @@ -74,7 +74,11 @@ define generate-common-build-props echo "ro.$(1).build.id?=$(BUILD_ID)" >> $(2);\ echo "ro.$(1).build.tags?=$(BUILD_VERSION_TAGS)" >> $(2);\ echo "ro.$(1).build.type=$(TARGET_BUILD_VARIANT)" >> $(2);\ - echo "ro.$(1).build.version.incremental=$(BUILD_NUMBER_FROM_FILE)" >> $(2);\ + if [[ $(BUILD_NUMBER_FROM_FILE) =~ ^eng\. ]]; then \ + echo "ro.$(1).build.version.incremental=`$(DATE_FROM_FILE) +%s`" >> $(2);\ + else \ + echo "ro.$(1).build.version.incremental=$(BUILD_NUMBER_FROM_FILE)" >> $(2);\ + fi; \ echo "ro.$(1).build.version.release=$(PLATFORM_VERSION_LAST_STABLE)" >> $(2);\ echo "ro.$(1).build.version.release_or_codename=$(PLATFORM_VERSION)" >> $(2);\ echo "ro.$(1).build.version.sdk=$(PLATFORM_SDK_VERSION)" >> $(2);\