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

am: 9159f4b08c

Change-Id: Ib946129ef14cf91aa57a1fb880dae3f29adace63
This commit is contained in:
Colin Cross 2017-11-04 01:32:19 +00:00 committed by android-build-merger
commit 31638ff73b
2 changed files with 3 additions and 2 deletions

View File

@ -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.
# ###############################################################

View File

@ -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