diff options
| author | Ying Wang <wangying@google.com> | 2014-06-10 22:29:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-10 22:29:18 +0000 |
| commit | dceddd91d9a6516346e752b9f942747bea931cfa (patch) | |
| tree | c0ab8d5f548f074f6dd4c2017f094002a8886f10 /core/tasks | |
| parent | 0d27626620676dbe72bf5c020008bb2dad20d75f (diff) | |
| parent | 79b46720e606e3db5fff87f672b73613a9a19c69 (diff) | |
| download | build-dceddd91d9a6516346e752b9f942747bea931cfa.zip build-dceddd91d9a6516346e752b9f942747bea931cfa.tar.gz build-dceddd91d9a6516346e752b9f942747bea931cfa.tar.bz2 | |
am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion."
* commit '79b46720e606e3db5fff87f672b73613a9a19c69':
Fix loophole in module expansion.
Diffstat (limited to 'core/tasks')
| -rw-r--r-- | core/tasks/vendor_module_check.mk | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/core/tasks/vendor_module_check.mk b/core/tasks/vendor_module_check.mk index 99d3d9e..9c19422 100644 --- a/core/tasks/vendor_module_check.mk +++ b/core/tasks/vendor_module_check.mk @@ -39,20 +39,7 @@ _vendor_owner_whitelist := \ ifneq (,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_RESTRICT_VENDOR_FILES)) -_vendor_check_modules := $(sort $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES)) -$(call expand-required-modules,_vendor_check_modules,$(_vendor_check_modules)) - -# Expand the target modules installed via LOCAL_SHARED_LIBRARIES -# $(1): the list of modules to expand. -define expand-required-shared-libraries -$(eval _ersl_new_modules := $(filter $(addsuffix :%,$(1)),$(TARGET_DEPENDENCIES_ON_SHARED_LIBRARIES)))\ -$(eval _ersl_new_modules := $(foreach p,$(_ersl_new_modules),$(word 3,$(subst :,$(space),$(p)))))\ -$(eval _ersl_new_modules := $(sort $(subst $(comma),$(space),$(_ersl_new_modules))))\ -$(eval _ersl_new_modules := $(filter-out $(_vendor_check_modules),$(_ersl_new_modules)))\ -$(if $(_ersl_new_modules),$(eval _vendor_check_modules += $(_ersl_new_modules))\ - $(call expand-required-shared-libraries,$(_ersl_new_modules))) -endef -$(call expand-required-shared-libraries,$(_vendor_check_modules)) +_vendor_check_modules := $(product_MODULES) _vendor_module_owner_info := # Restrict owners |