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

Commit 25f77e39 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am af4299c5: Merge "Store vendor module owner info on the build server." into jb-mr1-dev 

* commit 'af4299c5':
  Store vendor module owner info on the build server.
parents 0d24628c af4299c5

core/base_rules.mk

+2 −2
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ ALL_MODULES.$(LOCAL_MODULE).CHECKED := \ 
ALL_MODULES.$(LOCAL_MODULE).BUILT := \

    $(ALL_MODULES.$(LOCAL_MODULE).BUILT) $(LOCAL_BUILT_MODULE)

ALL_MODULES.$(LOCAL_MODULE).INSTALLED := \

    $(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(LOCAL_INSTALLED_MODULE)

    $(strip $(ALL_MODULES.$(LOCAL_MODULE).INSTALLED) $(LOCAL_INSTALLED_MODULE))

ALL_MODULES.$(LOCAL_MODULE).REQUIRED := \

    $(ALL_MODULES.$(LOCAL_MODULE).REQUIRED) $(LOCAL_REQUIRED_MODULES)

ALL_MODULES.$(LOCAL_MODULE).EVENT_LOG_TAGS := \
@@ -566,7 +566,7 @@ ALL_MODULES.$(LOCAL_MODULE).MAKEFILE := \ 
    $(ALL_MODULES.$(LOCAL_MODULE).MAKEFILE) $(LOCAL_MODULE_MAKEFILE)

ifdef LOCAL_MODULE_OWNER

ALL_MODULES.$(LOCAL_MODULE).OWNER := \

    $(strip $(ALL_MODULES.$(LOCAL_MODULE).OWNER) $(LOCAL_MODULE_OWNER))

    $(sort $(ALL_MODULES.$(LOCAL_MODULE).OWNER) $(LOCAL_MODULE_OWNER))

endif



INSTALLABLE_FILES.$(LOCAL_INSTALLED_MODULE).MODULE := $(LOCAL_MODULE)

core/tasks/vendor_module_check.mk

+25 −3
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 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))



_vendor_module_owner_info :=

# Restrict owners

ifneq (,$(filter true owner all, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_RESTRICT_VENDOR_FILES)))
@@ -51,7 +52,8 @@ _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)))

    $(error Error: vendor PRODUCT_COPY_FILES file "$(c)" has unknown owner))\

  $(eval _vendor_module_owner_info += $(call word-colon,2,$(c)):$(call word-colon,3,$(c))))

endif

_vendor_check_copy_files :=
@@ -59,7 +61,9 @@ $(foreach m, $(_vendor_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)"))))

        "$(ALL_MODULES.$(m).OWNER)" in product "$(TARGET_PRODUCT)"))\

    $(if $(ALL_MODULES.$(m).INSTALLED),\

      $(eval _vendor_module_owner_info += $(patsubst $(PRODUCT_OUT)/%,%,$(ALL_MODULES.$(m).INSTALLED)):$(ALL_MODULES.$(m).OWNER)))))



endif
@@ -76,5 +80,23 @@ $(foreach m, $(_vendor_check_modules), \ 


endif



_vendor_module_owner_info_txt := $(call intermediates-dir-for,PACKAGING,vendor_owner_info)/vendor_owner_info.txt

$(_vendor_module_owner_info_txt): PRIVATE_INFO := $(_vendor_module_owner_info)

$(_vendor_module_owner_info_txt):

	@echo "Write vendor module owner info $@"

	@mkdir -p $(dir $@) && rm -f $@

ifdef _vendor_module_owner_info

	@for w in $(PRIVATE_INFO); \

	  do \

	    echo $$w >> $@; \

	done

else

	@echo "No vendor module owner info." > $@

endif



$(call dist-for-goals, droidcore, $(_vendor_module_owner_info_txt))



_vendor_module_owner_info_txt :=

_vendor_module_owner_info :=

_vendor_check_modules :=

endif