diff options
| author | Ying Wang <wangying@google.com> | 2012-09-20 17:12:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-20 17:12:01 -0700 |
| commit | 20a7c2c10d892ebb8d128794e862ad17ef1056e2 (patch) | |
| tree | b120a3c295c9200054f3794687be617dd1f0dfbf /core/tasks/vendor_module_check.mk | |
| parent | d81b9d220e00a9ffecea3b9067c6416b2c1e6bbd (diff) | |
| parent | 4b0486b4a6108ea863da6232cc376cd1edc55640 (diff) | |
| download | build-20a7c2c10d892ebb8d128794e862ad17ef1056e2.zip build-20a7c2c10d892ebb8d128794e862ad17ef1056e2.tar.gz build-20a7c2c10d892ebb8d128794e862ad17ef1056e2.tar.bz2 | |
Merge "Allow to tag owner to PRODUCT_COPY_FILES" into jb-mr1-dev
Diffstat (limited to 'core/tasks/vendor_module_check.mk')
| -rw-r--r-- | core/tasks/vendor_module_check.mk | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/core/tasks/vendor_module_check.mk b/core/tasks/vendor_module_check.mk index 9cbca41..cbee384 100644 --- a/core/tasks/vendor_module_check.mk +++ b/core/tasks/vendor_module_check.mk @@ -17,22 +17,22 @@ # Restrict the vendor module owners here. _vendor_owner_whitelist := \ asus \ - audience \ - broadcom \ - csr \ + audience \ + broadcom \ + csr \ elan \ google \ - imgtec \ - invensense \ + imgtec \ + invensense \ lge \ nvidia \ - nxp \ + nxp \ qcom \ - samsung \ - samsung_arm \ - ti \ + samsung \ + samsung_arm \ + ti \ trusted_logic \ - widevine + widevine ifneq (,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_RESTRICT_VENDOR_FILES)) @@ -47,10 +47,13 @@ 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))) +_vendor_check_copy_files := $(filter vendor/%, $(PRODUCT_COPY_FILES)) +ifneq (,$(_vendor_check_copy_files)) +$(foreach c, $(_vendor_check_copy_files), \ + $(if $(filter $(_vendor_owner_whitelist), $(call word-colon, 3, $(c))),,\ + $(error Error: vendor PRODUCT_COPY_FILES file "$(c)" has unknown owner))) endif +_vendor_check_copy_files := $(foreach m, $(_vendor_check_modules), \ $(if $(filter vendor/%, $(ALL_MODULES.$(m).PATH)),\ |