StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Partially revert BUILD_DATETIME change" am: f5a87046c5 am: 0d68c850f7

Browse Source 
am: 4b03c695d6

Change-Id: Ife94343139c513f5e80c87d8dbcd88587f99f2e3
This commit is contained in:
Colin Cross
2018-02-16 20:25:09 +00:00
committed by android-build-merger
parent d02d0723c4 4b03c695d6
commit b351b6ebde
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/version_defaults.mk
View File

@@ -254,12 +254,23 @@ ifndef BUILD_ID
BUILD_ID := UNKNOWN BUILD_ID := UNKNOWN
endif endif
ifneq (,$(findstring Darwin,$(UNAME))) ifndef BUILD_DATETIME
DATE := date -r $(shell cat $(BUILD_DATETIME_FILE)) # Used to reproduce builds by setting the same time. Must be the number
else # of seconds since the Epoch.
DATE := date -d @$(shell cat $(BUILD_DATETIME_FILE)) BUILD_DATETIME := $(shell date +%s)
endif endif
ifneq (,$(findstring Darwin,$(UNAME)))
DATE := date -r $(BUILD_DATETIME)
else
DATE := date -d @$(BUILD_DATETIME)
endif
# Everything should be using BUILD_DATETIME_FROM_FILE instead.
# BUILD_DATETIME and DATE can be removed once BUILD_NUMBER moves
# to soong_ui.
BUILD_DATETIME :=
ifndef BUILD_NUMBER ifndef BUILD_NUMBER
# BUILD_NUMBER should be set to the source control value that # BUILD_NUMBER should be set to the source control value that
# represents the current state of the source code. E.g., a # represents the current state of the source code. E.g., a