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

Commit 752ace6e authored by Steve Kondik's avatar Steve Kondik Committed by Ethan Chen
Browse files

build: Add support for PRODUCT_COPY_FILES_OVERRIDES 

 * We may have a case where prebuilts need to be built from
   source instead based on an externalized config.
 * New directive takes a list of destination files to remove from
   PRODUCT_COPY_FILES so that other instructions can be supplied.

Change-Id: I7feff16440e54d1676ffddbbd96d5947efa43ede
parent e9eac0aa

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ _product_var_list := \ 
    PRODUCT_DEFAULT_PROPERTY_OVERRIDES \

    PRODUCT_CHARACTERISTICS \

    PRODUCT_COPY_FILES \

    PRODUCT_COPY_FILES_OVERRIDES \

    PRODUCT_OTA_PUBLIC_KEYS \

    PRODUCT_EXTRA_RECOVERY_KEYS \

    PRODUCT_PACKAGE_OVERLAYS \

core/product_config.mk

+16 −0
Original line number Diff line number Diff line
@@ -345,6 +345,22 @@ PRODUCT_COPY_FILES += \ 
endif

_boot_animation :=



# We might want to skip items listed in PRODUCT_COPY_FILES for

# various reasons. This is useful for replacing a binary module with one

# built from source. This should be a list of destination files under $OUT

PRODUCT_COPY_FILES_OVERRIDES := \

	$(addprefix %:, $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_COPY_FILES_OVERRIDES)))



ifneq ($(PRODUCT_COPY_FILES_OVERRIDES),)

    PRODUCT_COPY_FILES := $(filter-out $(PRODUCT_COPY_FILES_OVERRIDES), $(PRODUCT_COPY_FILES))

endif



.PHONY: listcopies

listcopies:

	@echo "Copy files: $(PRODUCT_COPY_FILES)"

	@echo "Overrides: $(PRODUCT_COPY_FILES_OVERRIDES)"





# A list of property assignments, like "key = value", with zero or more

# whitespace characters on either side of the '='.

PRODUCT_PROPERTY_OVERRIDES := \

core/tasks/product-graph.mk

+1 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ $(OUT_DIR)/products/$(strip $(1)).txt: $(this_makefile) 
	$(hide) echo 'PRODUCT_DEFAULT_PROPERTY_OVERRIDES=$$(PRODUCTS.$(strip $(1)).PRODUCT_DEFAULT_PROPERTY_OVERRIDES)' >> $$@

	$(hide) echo 'PRODUCT_CHARACTERISTICS=$$(PRODUCTS.$(strip $(1)).PRODUCT_CHARACTERISTICS)' >> $$@

	$(hide) echo 'PRODUCT_COPY_FILES=$$(PRODUCTS.$(strip $(1)).PRODUCT_COPY_FILES)' >> $$@

	$(hide) echo 'PRODUCT_COPY_FILES_OVERRIDES=$$(PRODUCTS.$(strip $(1)).PRODUCT_COPY_FILES_OVERRIDES)' >> $$@

	$(hide) echo 'PRODUCT_OTA_PUBLIC_KEYS=$$(PRODUCTS.$(strip $(1)).PRODUCT_OTA_PUBLIC_KEYS)' >> $$@

	$(hide) echo 'PRODUCT_EXTRA_RECOVERY_KEYS=$$(PRODUCTS.$(strip $(1)).PRODUCT_EXTRA_RECOVERY_KEYS)' >> $$@

	$(hide) echo 'PRODUCT_PACKAGE_OVERLAYS=$$(PRODUCTS.$(strip $(1)).PRODUCT_PACKAGE_OVERLAYS)' >> $$@