Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b67e41f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 588d913a 648017c2

core/main.mk

+0 −4
Original line number Diff line number Diff line
@@ -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.

core/version_defaults.mk

+1 −9
Original line number Diff line number Diff line
@@ -256,12 +256,8 @@ 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

endif

.KATI_READONLY := PLATFORM_SECURITY_PATCH_TIMESTAMP



ifndef PLATFORM_BASE_OS
@@ -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.