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

Commit 2582554c authored Feb 13, 2019 by Anton Hansson Committed by Gerrit Code Review Feb 13, 2019

Merge "Move dump-products back to the config stage"

parents 95c7f58b dce3f920

core/main.mk

+0 −5

Original line number	Diff line number	Diff line
		@@ -1590,11 +1590,6 @@ modules:
		@echo "$(call module-names-for-tag-list,$(ALL_MODULE_TAGS))" \| \
		tr -s ' ' '\n' \| sort -u \| $(COLUMN)

		.PHONY: dump-products
		dump-products:
		$(dump-products)
		@echo Successfully dumped products

		.PHONY: dump-files
		dump-files:
		$(info product_FILES for $(TARGET_DEVICE) ($(INTERNAL_PRODUCT)):)

core/product.mk

+3 −3

Original line number	Diff line number	Diff line
		@@ -233,10 +233,10 @@ _product_var_list := \
		PRODUCT_CHECK_ELF_FILES \

		define dump-product
		$(info ==== $(1) ====)\
		$(warning ==== $(1) ====)\
		$(foreach v,$(_product_var_list),\
		$(info PRODUCTS.$(1).$(v) := $(PRODUCTS.$(1).$(v))))\
		$(info --------)
		$(warning PRODUCTS.$(1).$(v) := $(PRODUCTS.$(1).$(v))))\
		$(warning --------)
		endef

		define dump-products

core/product_config.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -237,6 +237,10 @@ $(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\
		# Sanity check
		$(check-all-products)

		ifneq ($(filter dump-products, $(MAKECMDGOALS)),)
		$(dump-products)
		endif

		# Convert a short name like "sooner" into the path to the product
		# file defining that product.
		#