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

Commit e96bfdb3 authored by Colin Cross's avatar Colin Cross
Browse files

Move BUILD_*_FROM_FILE to config.mk 

BUILD_NUMBER_FROM_FILE and BUILD_DATETIME_FROM_FILE may need to
be referenced before main.mk has been parsed, move them to config.mk.

Bug: 68865363
Test: m -j TARGET_PRODUCT=full TARGET_BUILD_APPS=Gallery
      aapt dump xmltree out/target/product/generic/obj/APPS/Gallery_intermediates/package.apk AndroidManifest.xml | grep Version
Change-Id: I9361a394469e61fcdf5a2b9509ef2bb2b373d6e7
parent bd532fbf

core/config.mk

+3 −0
Original line number Diff line number Diff line
@@ -741,6 +741,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