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

Merge "require-artifacts-in-path does not require PRODUCT_NAME/BRAND."

This commit is contained in:
Yifan Hong 2020-12-11 20:24:19 +00:00 committed by Gerrit Code Review
parent 88256fd724 e086ae045e
commit 999779bdce
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/product_config.mk
View File

@ -160,15 +160,16 @@ endif
$(call import-products, $(current_product_makefile)) $(call import-products, $(current_product_makefile))
endif # Import all or just the current product makefile endif # Import all or just the current product makefile
# Quick check
$(check-all-products)
# Import all the products that have made artifact path requirements, so that we can verify # Import all the products that have made artifact path requirements, so that we can verify
# the artifacts they produce. # the artifacts they produce.
# These are imported after check-all-products because some of them might not be real products.
$(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\ $(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\
$(if $(filter-out $(makefile),$(PRODUCTS)),$(eval $(call import-products,$(makefile))))\ $(if $(filter-out $(makefile),$(PRODUCTS)),$(eval $(call import-products,$(makefile))))\
) )
# Quick check
$(check-all-products)
ifneq ($(filter dump-products, $(MAKECMDGOALS)),) ifneq ($(filter dump-products, $(MAKECMDGOALS)),)
$(dump-products) $(dump-products)
endif endif

3
target/product/generic_ramdisk.mk
View File

@ -19,9 +19,6 @@
# This makefile checks that other makefiles must not install things to the # This makefile checks that other makefiles must not install things to the
# ramdisk. # ramdisk.
PRODUCT_NAME := generic_ramdisk
PRODUCT_BRAND := generic
# Ramdisk # Ramdisk
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
init_first_stage \ init_first_stage \