Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9592af96 authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev

parents 9b855f67 d6b1d61d

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ include $(BUILD_SYSTEM)/base_rules.mk 
# of the shared libraries are determined.

ifdef LOCAL_INSTALLED_MODULE

ifdef installed_shared_library_module_names

$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += $(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(installed_shared_library_module_names))

$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += $(LOCAL_MODULE):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(installed_shared_library_module_names))

endif

endif

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ ALL_FINDBUGS_FILES:= 
ALL_GPL_MODULE_LICENSE_FILES:=



# Target and host installed module's dependencies on shared libraries.

# They are list of "<installed_file>:lib1,lib2...".

# They are list of "<module_name>:<installed_file>:lib1,lib2...".

TARGET_DEPENDENCIES_ON_SHARED_LIBRARIES :=

HOST_DEPENDENCIES_ON_SHARED_LIBRARIES :=

core/main.mk

+2 −2
Original line number Diff line number Diff line
@@ -556,12 +556,12 @@ $(foreach m,$(TARGET_DEPENDENCIES_ON_SHARED_LIBRARIES), \ 
  $(eval p := $(subst :,$(space),$(m))) \

  $(eval r := $(filter $(TARGET_OUT_ROOT)/%,$(call module-installed-files,\

    $(subst $(comma),$(space),$(lastword $(p)))))) \

  $(eval $(call add-required-deps,$(firstword $(p)),$(r))))

  $(eval $(call add-required-deps,$(word 2,$(p)),$(r))))

$(foreach m,$(HOST_DEPENDENCIES_ON_SHARED_LIBRARIES), \

  $(eval p := $(subst :,$(space),$(m))) \

  $(eval r := $(filter $(HOST_OUT_ROOT)/%,$(call module-installed-files,\

    $(subst $(comma),$(space),$(lastword $(p)))))) \

  $(eval $(call add-required-deps,$(firstword $(p)),$(r))))

  $(eval $(call add-required-deps,$(word 2,$(p)),$(r))))



m :=

r :=

core/prebuilt.mk

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ endif # prebuilt_module_is_a_library 
# of the shared libraries are determined.

ifdef LOCAL_INSTALLED_MODULE

ifdef LOCAL_SHARED_LIBRARIES

$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += $(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(LOCAL_SHARED_LIBRARIES))

$(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES += $(LOCAL_MODULE):$(LOCAL_INSTALLED_MODULE):$(subst $(space),$(comma),$(LOCAL_SHARED_LIBRARIES))

endif

endif

core/tasks/vendor_module_check.mk

+12 −0
Original line number Diff line number Diff line
@@ -40,6 +40,18 @@ 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_module_owner_info :=

# Restrict owners

ifneq (,$(filter true owner all, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_RESTRICT_VENDOR_FILES)))