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

Commit 31638ff7 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Move BUILD_*_FROM_FILE to config.mk" am: ab5ce7e1 

am: 9159f4b0

Change-Id: Ib946129ef14cf91aa57a1fb880dae3f29adace63
parents 7e064add 9159f4b0

core/config.mk

+3 −0
Original line number Diff line number Diff line
@@ -759,6 +759,9 @@ else 
  FRAMEWORK_COMPATIBILITY_MATRIX_FILE := hardware/interfaces/compatibility_matrix.current.xml

endif



BUILD_NUMBER_FROM_FILE := $$(cat $(OUT_DIR)/build_number.txt)

BUILD_DATETIME_FROM_FILE := $$(cat $(OUT_DIR)/build_date.txt)



# ###############################################################

# Set up final options.

# ###############################################################

core/main.mk

+0 −2
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ include $(BUILD_SYSTEM)/clang/config.mk 
$(shell mkdir -p $(OUT_DIR) && \

    echo -n $(BUILD_NUMBER) > $(OUT_DIR)/build_number.txt && \

    echo -n $(BUILD_DATETIME) > $(OUT_DIR)/build_date.txt)

BUILD_NUMBER_FROM_FILE := $$(cat $(OUT_DIR)/build_number.txt)

BUILD_DATETIME_FROM_FILE := $$(cat $(OUT_DIR)/build_date.txt)

ifeq ($(HOST_OS),darwin)

DATE_FROM_FILE := date -r $(BUILD_DATETIME_FROM_FILE)

else