diff options
| author | Conley Owens <cco3@android.com> | 2012-01-11 08:36:23 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-11 08:36:23 -0800 |
| commit | b5370bc4cb40a6b20cc1b34c0b583ba78618741c (patch) | |
| tree | 01412583aff91f43edf384ca32223c0b2431533d | |
| parent | b6737c1366aa0b5ca590a508dcab49e6e2b1e0fe (diff) | |
| parent | 8e0f7129fa255d94e94042deda7f1113503a7a87 (diff) | |
| download | build-b5370bc4cb40a6b20cc1b34c0b583ba78618741c.zip build-b5370bc4cb40a6b20cc1b34c0b583ba78618741c.tar.gz build-b5370bc4cb40a6b20cc1b34c0b583ba78618741c.tar.bz2 | |
Merge "Add a module_path_check for vendor files"
| -rw-r--r-- | core/tasks/vendor_module_check.mk (renamed from core/tasks/module_owner_check.mk) | 50 |
1 files changed, 34 insertions, 16 deletions
diff --git a/core/tasks/module_owner_check.mk b/core/tasks/vendor_module_check.mk index 453e718..c2d6c78 100644 --- a/core/tasks/module_owner_check.mk +++ b/core/tasks/vendor_module_check.mk @@ -15,7 +15,6 @@ # # Restrict the vendor module owners here. - _vendor_owner_whitelist := \ broadcom \ csr \ @@ -26,36 +25,55 @@ _vendor_owner_whitelist := \ ti -ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_RESTRICT_VENDOR_FILES)) +ifneq (,$(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: \ - $(filter vendor/%, $(PRODUCT_PACKAGE_OVERLAYS) $(DEVICE_PACKAGE_OVERLAYS))) -endif -ifneq (,$(filter vendor/%, $(PRODUCT_COPY_FILES))) -$(error Error: Product "$(TARGET_PRODUCT)" can not have PRODUCT_COPY_FILES from vendor tree: \ - $(filter vendor/%, $(PRODUCT_COPY_FILES))) -endif - -_owner_check_modules := $(sort $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES)) +_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))\ + $(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, $(_owner_check_modules)) +$(call _expand_required_modules, $(_check_modules)) + + +# Restrict owners +ifneq (,$(filter true owner all, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_RESTRICT_VENDOR_FILES))) -$(foreach m, $(_owner_check_modules), \ +ifneq (,$(filter vendor/%, $(PRODUCT_PACKAGE_OVERLAYS) $(DEVICE_PACKAGE_OVERLAYS))) +$(error Error: Product "$(TARGET_PRODUCT)" can not have overlay in vendor tree: \ + $(filter vendor/%, $(PRODUCT_PACKAGE_OVERLAYS) $(DEVICE_PACKAGE_OVERLAYS))) +endif +ifneq (,$(filter vendor/%, $(PRODUCT_COPY_FILES))) +$(error Error: Product "$(TARGET_PRODUCT)" can not have PRODUCT_COPY_FILES from vendor tree: \ + $(filter vendor/%, $(PRODUCT_COPY_FILES))) +endif + +$(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 |