p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move dump-products back to the config stage 

It's unnecessary to run all the make file parsing to dump product
configs. Move the dumping to product_config.mk instead, but switch
the output to $(warnings) as stdout is a bit sensitive during
the config stage.

Test: multiproduct_kati -only-config dump-products
Change-Id: I8c7365c9f90ea2bf152b82dfb983bfb0cdcb1697
This commit is contained in:
Anton Hansson 2019-02-11 21:19:54 +00:00
parent 375291fa26
commit dce3f920f2
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/main.mk
View File

@ -1590,11 +1590,6 @@ modules:
@echo "$(call module-names-for-tag-list,$(ALL_MODULE_TAGS))" | \ @echo "$(call module-names-for-tag-list,$(ALL_MODULE_TAGS))" | \
tr -s ' ' '\n' | sort -u | $(COLUMN) tr -s ' ' '\n' | sort -u | $(COLUMN)
.PHONY: dump-products
dump-products:
$(dump-products)
@echo Successfully dumped products
.PHONY: dump-files .PHONY: dump-files
dump-files: dump-files:
$(info product_FILES for $(TARGET_DEVICE) ($(INTERNAL_PRODUCT)):) $(info product_FILES for $(TARGET_DEVICE) ($(INTERNAL_PRODUCT)):)

6
core/product.mk
View File

@ -233,10 +233,10 @@ _product_var_list := \
PRODUCT_CHECK_ELF_FILES \ PRODUCT_CHECK_ELF_FILES \
define dump-product define dump-product
$(info ==== $(1) ====)\ $(warning ==== $(1) ====)\
$(foreach v,$(_product_var_list),\ $(foreach v,$(_product_var_list),\
$(info PRODUCTS.$(1).$(v) := $(PRODUCTS.$(1).$(v))))\ $(warning PRODUCTS.$(1).$(v) := $(PRODUCTS.$(1).$(v))))\
$(info --------) $(warning --------)
endef endef
define dump-products define dump-products

4
core/product_config.mk
View File

@ -237,6 +237,10 @@ $(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\
# Sanity check # Sanity check
$(check-all-products) $(check-all-products)
ifneq ($(filter dump-products, $(MAKECMDGOALS)),)
$(dump-products)
endif
# Convert a short name like "sooner" into the path to the product # Convert a short name like "sooner" into the path to the product
# file defining that product. # file defining that product.
# #