From f47d5802e627bf14cecc425b8c3e00e001c0f7c2 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Mon, 23 Sep 2013 21:15:23 -0700 Subject: [PATCH] Don't check vendor path for phony packages These don't get installed, so they don't need to be in TARGET_OUT_VENDOR Change-Id: I887ca4758e7c477808ed9a6b621dfd3f4ede5f32 --- core/tasks/vendor_module_check.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/tasks/vendor_module_check.mk b/core/tasks/vendor_module_check.mk index fcf2bbedd..add889a1b 100644 --- a/core/tasks/vendor_module_check.mk +++ b/core/tasks/vendor_module_check.mk @@ -85,10 +85,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 $(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 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))))) endif