From 70a358147b213ae1624949f289986696ee973e21 Mon Sep 17 00:00:00 2001 From: hanyuhang Date: Sun, 27 Sep 2020 12:20:32 +0800 Subject: [PATCH] update android version:v1.0-rc5 --- core/Makefile | 2 +- core/build_id.mk | 2 +- core/version_defaults.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index 5badde558..cd11ae88a 100644 --- a/core/Makefile +++ b/core/Makefile @@ -174,7 +174,7 @@ ifeq ($(TARGET_BUILD_VARIANT),user) ifeq "true" "$(DISPLAY_BUILD_NUMBER)" BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) $(BUILD_KEYS) else - BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_KEYS) + BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_NUMBER) endif else # Non-user builds should show detailed build information diff --git a/core/build_id.mk b/core/build_id.mk index 072f442d9..575517986 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=N6F26Q +export BUILD_ID=v1.0-rc5 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 550fc70ce..43005317e 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -156,5 +156,5 @@ ifeq "" "$(BUILD_NUMBER)" # If no BUILD_NUMBER is set, create a useful "I am an engineering build # from this date/time" value. Make it start with a non-digit so that # anyone trying to parse it as an integer will probably get "0". - BUILD_NUMBER := eng.$(shell echo $${USER:0:6}).$(shell $(DATE) +%Y%m%d.%H%M%S) + BUILD_NUMBER := $(shell $(DATE) +%Y%m%d.%H%M%S) endif -- Gitee