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

Merge "Remove macOS special cases pertaining to date(1)."

Browse Source 
am: 0b67e41f3f

Change-Id: Ib03100cab82a999208bfb9248bad3ad6208a3cd5
This commit is contained in:
Elliott Hughes
2019-09-12 18:08:00 -07:00
committed by android-build-merger
parent d9f835bab8 0b67e41f3f
commit a8cfe0ec57
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/main.mk
View File

@@ -44,11 +44,7 @@ BUILD_NUMBER_FILE := $(OUT_DIR)/build_number.txt
.KATI_READONLY := BUILD_NUMBER_FILE
$(KATI_obsolete_var BUILD_NUMBER,See https://android.googlesource.com/platform/build/+/master/Changes.md#BUILD_NUMBER)
ifeq ($(HOST_OS),darwin)
DATE_FROM_FILE := date -r $(BUILD_DATETIME_FROM_FILE)
else
DATE_FROM_FILE := date -d @$(BUILD_DATETIME_FROM_FILE)
endif
.KATI_READONLY := DATE_FROM_FILE
# Pick a reasonable string to use to identify files.

10
core/version_defaults.mk
View File

@@ -256,11 +256,7 @@ endif
ifndef PLATFORM_SECURITY_PATCH_TIMESTAMP
# Used to indicate the matching timestamp for the security patch string in PLATFORM_SECURITY_PATCH.
ifneq (,$(findstring Darwin,$(UNAME)))
PLATFORM_SECURITY_PATCH_TIMESTAMP := $(shell date -jf '%Y-%m-%d %T %Z' '$(PLATFORM_SECURITY_PATCH) 00:00:00 GMT' +%s)
else
PLATFORM_SECURITY_PATCH_TIMESTAMP := $(shell date -d 'TZ="GMT" $(PLATFORM_SECURITY_PATCH)' +%s)
endif
PLATFORM_SECURITY_PATCH_TIMESTAMP := $(shell date -d 'TZ="GMT" $(PLATFORM_SECURITY_PATCH)' +%s)
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH_TIMESTAMP
@@ -289,11 +285,7 @@ ifndef BUILD_DATETIME
BUILD_DATETIME := $(shell date +%s)
endif
ifneq (,$(findstring Darwin,$(UNAME)))
DATE := date -r $(BUILD_DATETIME)
else
DATE := date -d @$(BUILD_DATETIME)
endif
.KATI_READONLY := DATE
# Everything should be using BUILD_DATETIME_FROM_FILE instead.