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

Commit 1b38e254 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If0f4c5100d33cdee360344f5066786092c1ef22c
parents 46a5e283 999779bd

core/product_config.mk

+4 −3
Original line number Diff line number Diff line
@@ -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

+0 −3
Original line number Diff line number Diff line
@@ -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 \