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

Commit 5caf64b5 authored by Adrian DC's avatar Adrian DC
Browse files

build: Warn about prebuilt apk in PRODUCT_COPY_FILES 

 * Show a warning if an apk is found in PRODUCT_COPY_FILES

 * Partially reverts "build: Disable check
    for blocking prebuilt apk in PRODUCT_COPY_FILES"

Change-Id: I4830c4f46b1ee33d916d015b6ed02d02ecf7faa3
parent 1183ccdf

core/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ endif 
# src:dest pair is the first one to match the same dest"

#$(1): the src:dest pair

define check-product-copy-files

$(if $(filter %.apk, $(call word-colon, 2, $(1))),$(error \

$(if $(filter %.apk, $(call word-colon, 2, $(1))),$(info \

    Prebuilt apk found in PRODUCT_COPY_FILES: $(1), use BUILD_PREBUILT instead!))

endef

# filter out the duplicate <source file>:<dest file> pairs.
@@ -34,6 +34,7 @@ unique_product_copy_files_destinations := 
$(foreach cf,$(unique_product_copy_files_pairs), \

    $(eval _src := $(call word-colon,1,$(cf))) \

    $(eval _dest := $(call word-colon,2,$(cf))) \

    $(call check-product-copy-files,$(cf)) \

    $(if $(filter $(unique_product_copy_files_destinations),$(_dest)), \

        $(info PRODUCT_COPY_FILES $(cf) ignored.), \

        $(eval _fulldest := $(call append-path,$(PRODUCT_OUT),$(_dest))) \