Merge "Move dump-products back to the config stage"
diff --git a/core/main.mk b/core/main.mk
index 71b6ed7..14d2fe5 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1590,11 +1590,6 @@
@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)):)
diff --git a/core/product.mk b/core/product.mk
index 30bd87a..7c1e1b8 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -233,10 +233,10 @@
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
diff --git a/core/product_config.mk b/core/product_config.mk
index 01fbc0a..dcca592 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -237,6 +237,10 @@
# 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.
#