From 86b0dfb2d03a5b6fe8ec25b44f18f95c578bd4eb Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 2 Oct 2013 15:16:35 -0700 Subject: don't check paths of non-installed or host modules Static libraries and host modules are not installed under TARGET_OUT_VENDOR and don't need to be, relax the checks. Change-Id: Ia8b926d466420a8b6dd418d5e95fdf5ff919e078 --- core/tasks/vendor_module_check.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'core/tasks') diff --git a/core/tasks/vendor_module_check.mk b/core/tasks/vendor_module_check.mk index add889a..c51a40c 100644 --- a/core/tasks/vendor_module_check.mk +++ b/core/tasks/vendor_module_check.mk @@ -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)),,\ - $(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))))) + $(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)))))) endif -- cgit v1.1