Merge "require-artifacts-in-path does not require PRODUCT_NAME/BRAND." am: 999779bdce am: 1b38e254df

Original change: https://android-review.googlesource.com/c/platform/build/+/1524321

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If89a284d99143e10bbc4abff7d2f128c26f80bc3

core/product_config.mk

@@ -160,15 +160,16 @@ endif
 $(call import-products, $(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
 # 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),\
   $(if $(filter-out $(makefile),$(PRODUCTS)),$(eval $(call import-products,$(makefile))))\
 )
 
-# Quick check
-$(check-all-products)
-
 ifneq ($(filter dump-products, $(MAKECMDGOALS)),)
 $(dump-products)
 endif

target/product/generic_ramdisk.mk

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