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

Remove BUILD_DATETIME from Make.

Browse Source 
Soong_UI will handle build timestamp and export date file to Make.

Test: m -j32
Bug: b/70351683
Change-Id: Ibe4ceb1b224c5e8f3e1a8a59cfee89217765a901
This commit is contained in:
Nan Zhang
2018-02-14 13:30:53 -08:00
parent 895a8172ee
commit 975f41ed34
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/config.mk
View File

@@ -846,7 +846,7 @@ else
endif endif
BUILD_NUMBER_FROM_FILE := $$(cat $(OUT_DIR)/build_number.txt) BUILD_NUMBER_FROM_FILE := $$(cat $(OUT_DIR)/build_number.txt)
BUILD_DATETIME_FROM_FILE := $$(cat $(OUT_DIR)/build_date.txt) BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE))
# SEPolicy versions # SEPolicy versions

3
core/main.mk
View File

@@ -60,8 +60,7 @@ include $(BUILD_SYSTEM)/clang/config.mk
# without changing the command line every time. Avoids rebuilds # without changing the command line every time. Avoids rebuilds
# when using ninja. # when using ninja.
$(shell mkdir -p $(OUT_DIR) && \ $(shell mkdir -p $(OUT_DIR) && \
echo -n $(BUILD_NUMBER) > $(OUT_DIR)/build_number.txt && \ echo -n $(BUILD_NUMBER) > $(OUT_DIR)/build_number.txt)
echo -n $(BUILD_DATETIME) > $(OUT_DIR)/build_date.txt)
ifeq ($(HOST_OS),darwin) ifeq ($(HOST_OS),darwin)
DATE_FROM_FILE := date -r $(BUILD_DATETIME_FROM_FILE) DATE_FROM_FILE := date -r $(BUILD_DATETIME_FROM_FILE)
else else

11
core/version_defaults.mk
View File

@@ -24,7 +24,6 @@
# DEFAULT_APP_TARGET_SDK # DEFAULT_APP_TARGET_SDK
# BUILD_ID # BUILD_ID
# BUILD_NUMBER # BUILD_NUMBER
# BUILD_DATETIME
# PLATFORM_SECURITY_PATCH # PLATFORM_SECURITY_PATCH
# PLATFORM_VNDK_VERSION # PLATFORM_VNDK_VERSION
# PLATFORM_SYSTEMSDK_VERSIONS # PLATFORM_SYSTEMSDK_VERSIONS
@@ -255,16 +254,10 @@ ifndef BUILD_ID
BUILD_ID := UNKNOWN BUILD_ID := UNKNOWN
endif endif
ifndef BUILD_DATETIME
# Used to reproduce builds by setting the same time. Must be the number
# of seconds since the Epoch.
BUILD_DATETIME := $(shell date +%s)
endif
ifneq (,$(findstring Darwin,$(UNAME))) ifneq (,$(findstring Darwin,$(UNAME)))
DATE := date -r $(BUILD_DATETIME) DATE := date -r $(shell cat $(BUILD_DATETIME_FILE))
else else
DATE := date -d @$(BUILD_DATETIME) DATE := date -d @$(shell cat $(BUILD_DATETIME_FILE))
endif endif
ifndef BUILD_NUMBER ifndef BUILD_NUMBER