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

Commit 4babe39d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove BUILD_DATETIME from Make."

parents bd48f84f 975f41ed

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -846,7 +846,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

core/main.mk

+1 −2
Original line number Diff line number Diff line
@@ -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

core/version_defaults.mk

+2 −9
Original line number Diff line number Diff line
@@ -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