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

Commit da669fa5 authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

Merge changes I826b1ec6,I0667ef0e,Ie4481513 into main 

* changes:
  Add the list of makefiles that were also included by product config to dumpconfig.
  Add tracing for board config to dumpconfig
  Fix newline for dumpconfig
parents 0ad443b8 248580cb

core/board_config.mk

+2 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ else 
  .KATI_READONLY := TARGET_DEVICE_DIR

endif



$(call dump-phase-start,BOARD,,,, build/make/core/board_config.mk)

ifndef RBC_PRODUCT_CONFIG

include $(board_config_mk)

else
@@ -261,6 +262,7 @@ else 


  include $(OUT_DIR)/rbc/rbc_board_config_results.mk

endif

$(call dump-phase-end, build/make/core/board_config.mk)



ifneq (,$(and $(TARGET_ARCH),$(TARGET_ARCH_SUITE)))

  $(error $(board_config_mk) erroneously sets both TARGET_ARCH and TARGET_ARCH_SUITE)

core/dumpconfig.mk

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ BUILD_DATETIME_FILE := $(OUT_DIR)/build_date.txt 


# Escape quotation marks for CSV, and wraps in quotation marks.

define escape-for-csv

"$(subst ","",$1)"

"$(subst ","",$(subst $(newline), ,$1))"

endef



# Args:
@@ -68,7 +68,7 @@ endef 
# Args:

#   $(1): include stack

define dump-import-done

$(eval $(file >> $(DUMPCONFIG_FILE),imported,$(strip $(1))))

$(eval $(file >> $(DUMPCONFIG_FILE),imported,$(strip $(1)),$(filter-out $(1),$(MAKEFILE_LIST))))

endef



# Args: