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

Commit 36e95f31 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "don't check paths of non-installed or host modules" into klp-dev

parents 752cd60d 86b0dfb2

core/tasks/vendor_module_check.mk

+5 −4
Original line number Diff line number Diff line
@@ -86,10 +86,11 @@ ifneq (,$(filter path all, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_RESTRICT_VENDO 
$(foreach m, $(_vendor_check_modules), \

  $(if $(filter vendor/%, $(ALL_MODULES.$(m).PATH)),\

    $(if $(filter-out FAKE, $(ALL_MODULES.$(m).CLASS)),\

      $(if $(filter $(TARGET_OUT_VENDOR)/%, $(ALL_MODULES.$(m).INSTALLED)),,\

      $(if $(filter-out ,$(ALL_MODULES.$(m).INSTALLED)),\

        $(if $(filter $(TARGET_OUT_VENDOR)/% $(HOST_OUT)/%, $(ALL_MODULES.$(m).INSTALLED)),,\

          $(error Error: vendor module "$(m)" in $(ALL_MODULES.$(m).PATH) \

            in product "$(TARGET_PRODUCT)" being installed to \

          $(ALL_MODULES.$(m).INSTALLED) which is not in the vendor tree)))))

            $(ALL_MODULES.$(m).INSTALLED) which is not in the vendor tree))))))



endif