p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Remove BUILD_DATETIME from Make." am: 4babe39d0f am: 03bca8c4a8 

am: 649f5b3c9a

Change-Id: Iaf6c6240dce29da37b2b4dd30abbc7326a5464be
This commit is contained in:
Nan Zhang 2018-02-15 22:59:46 +00:00 committed by android-build-merger
parent f8256a570a 649f5b3c9a
commit f1cbc5dbf1
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/config.mk
View File

@ -847,7 +847,7 @@ else
endif
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

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
# when using ninja.
$(shell mkdir -p $(OUT_DIR) && \
echo -n $(BUILD_NUMBER) > $(OUT_DIR)/build_number.txt && \
echo -n $(BUILD_DATETIME) > $(OUT_DIR)/build_date.txt)
echo -n $(BUILD_NUMBER) > $(OUT_DIR)/build_number.txt)
ifeq ($(HOST_OS),darwin)
DATE_FROM_FILE := date -r $(BUILD_DATETIME_FROM_FILE)
else

11
core/version_defaults.mk
View File

@ -24,7 +24,6 @@
# DEFAULT_APP_TARGET_SDK
# BUILD_ID
# BUILD_NUMBER
# BUILD_DATETIME
# PLATFORM_SECURITY_PATCH
# PLATFORM_VNDK_VERSION
# PLATFORM_SYSTEMSDK_VERSIONS
@ -255,16 +254,10 @@ ifndef BUILD_ID
BUILD_ID := UNKNOWN
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)))
DATE := date -r $(BUILD_DATETIME)
DATE := date -r $(shell cat $(BUILD_DATETIME_FILE))
else
DATE := date -d @$(BUILD_DATETIME)
DATE := date -d @$(shell cat $(BUILD_DATETIME_FILE))
endif
ifndef BUILD_NUMBER