Merge "Add a module_path_check for vendor files"
This commit is contained in:
commit
b5370bc4cb
|
@ -15,7 +15,6 @@
|
|||
#
|
||||
|
||||
# Restrict the vendor module owners here.
|
||||
|
||||
_vendor_owner_whitelist := \
|
||||
broadcom \
|
||||
csr \
|
||||
|
@ -26,7 +25,26 @@ _vendor_owner_whitelist := \
|
|||
ti
|
||||
|
||||
|
||||
ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_RESTRICT_VENDOR_FILES))
|
||||
ifneq (,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_RESTRICT_VENDOR_FILES))
|
||||
|
||||
_check_modules := $(sort $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES))
|
||||
|
||||
# expand with the required modules
|
||||
# $(1) the module name set to expand
|
||||
define _expand_required_modules
|
||||
$(eval _erm_new_modules:=)\
|
||||
$(foreach m, $(1), $(eval r:=$(ALL_MODULES.$(m).REQUIRED))\
|
||||
$(if $(r), $(if $(filter $(_check_modules), $(r)),,\
|
||||
$(eval _check_modules := $(_check_modules) $(r))\
|
||||
$(eval _erm_new_modules := $(_erm_new_modules) $(r)))))\
|
||||
$(if $(_erm_new_modules), $(call _expand_required_modules, $(_erm_new_modules)))
|
||||
endef
|
||||
|
||||
$(call _expand_required_modules, $(_check_modules))
|
||||
|
||||
|
||||
# Restrict owners
|
||||
ifneq (,$(filter true owner all, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_RESTRICT_VENDOR_FILES)))
|
||||
|
||||
ifneq (,$(filter vendor/%, $(PRODUCT_PACKAGE_OVERLAYS) $(DEVICE_PACKAGE_OVERLAYS)))
|
||||
$(error Error: Product "$(TARGET_PRODUCT)" can not have overlay in vendor tree: \
|
||||
|
@ -37,25 +55,25 @@ $(error Error: Product "$(TARGET_PRODUCT)" can not have PRODUCT_COPY_FILES from
|
|||
$(filter vendor/%, $(PRODUCT_COPY_FILES)))
|
||||
endif
|
||||
|
||||
_owner_check_modules := $(sort $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES))
|
||||
|
||||
# expand with the required modules
|
||||
# $(1) the module name set to expand
|
||||
define _expand_required_modules
|
||||
$(eval _erm_new_modules:=)\
|
||||
$(foreach m, $(1), $(eval r:=$(ALL_MODULES.$(m).REQUIRED))\
|
||||
$(if $(r), $(if $(filter $(_owner_check_modules), $(r)),,\
|
||||
$(eval _owner_check_modules := $(_owner_check_modules) $(r))\
|
||||
$(eval _erm_new_modules := $(_erm_new_modules) $(r)))))\
|
||||
$(if $(_erm_new_modules), $(call _expand_required_modules, $(_erm_new_modules)))
|
||||
endef
|
||||
|
||||
$(call _expand_required_modules, $(_owner_check_modules))
|
||||
|
||||
$(foreach m, $(_owner_check_modules), \
|
||||
$(foreach m, $(_check_modules), \
|
||||
$(if $(filter vendor/%, $(ALL_MODULES.$(m).PATH)),\
|
||||
$(if $(filter $(_vendor_owner_whitelist), $(ALL_MODULES.$(m).OWNER)),,\
|
||||
$(error Error: vendor module "$(m)" in $(ALL_MODULES.$(m).PATH) with unknown owner \
|
||||
"$(ALL_MODULES.$(m).OWNER)" in product "$(TARGET_PRODUCT)"))))
|
||||
|
||||
endif
|
||||
|
||||
|
||||
# Restrict paths
|
||||
ifneq (,$(filter path all, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_RESTRICT_VENDOR_FILES)))
|
||||
|
||||
$(foreach m, $(_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))))
|
||||
|
||||
endif
|
||||
|
||||
endif
|
Loading…
Reference in New Issue