StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 79b46720: am 02f98a26: Merge "Fix loophole in module expansion."

Browse Source 
* commit '79b46720e606e3db5fff87f672b73613a9a19c69':
  Fix loophole in module expansion.
This commit is contained in:
Ying Wang
2014-06-10 22:29:18 +00:00
committed by Android Git Automerger
parent 0d27626620 79b46720e6
commit dceddd91d9
5 changed files with 40 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/tasks/vendor_module_check.mk
View File

@@ -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