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

Commit 544b5568 authored by Yo Chiang's avatar Yo Chiang Committed by Gerrit Code Review
Browse files

Merge "Fix missing required dependency caused by circular dependency"

parents 4cecc437 e73c5a07

core/main.mk

+3 −5
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ $(foreach m,$(ALL_MODULES), \ 
    $(eval r := $(call module-installed-files,$(r))) \

    $(eval h_m := $(filter $(HOST_OUT)/%, $(ALL_MODULES.$(m).INSTALLED))) \

    $(eval h_r := $(filter $(HOST_OUT)/%, $(r))) \

    $(eval h_m := $(filter-out $(h_r), $(h_m))) \

    $(eval h_r := $(filter-out $(h_m), $(h_r))) \

    $(if $(h_m), $(eval $(call add-required-deps, $(h_m),$(h_r)))) \

  ) \

)
@@ -764,7 +764,7 @@ $(foreach m,$(ALL_MODULES), \ 
    $(eval r := $(call module-installed-files,$(r))) \

    $(eval hc_m := $(filter $(HOST_CROSS_OUT)/%, $(ALL_MODULES.$(m).INSTALLED))) \

    $(eval hc_r := $(filter $(HOST_CROSS_OUT)/%, $(r))) \

    $(eval hc_m := $(filter-out $(hc_r), $(hc_m))) \

    $(eval hc_r := $(filter-out $(hc_m), $(hc_r))) \

    $(if $(hc_m), $(eval $(call add-required-deps, $(hc_m),$(hc_r)))) \

  ) \

)
@@ -780,7 +780,7 @@ $(foreach m,$(ALL_MODULES), \ 
    $(eval r := $(call module-installed-files,$(r))) \

    $(eval t_m := $(filter $(TARGET_OUT_ROOT)/%, $(ALL_MODULES.$(m).INSTALLED))) \

    $(eval t_r := $(filter $(TARGET_OUT_ROOT)/%, $(r))) \

    $(eval t_m := $(filter-out $(t_r), $(t_m))) \

    $(eval t_r := $(filter-out $(t_m), $(t_r))) \

    $(if $(t_m), $(eval $(call add-required-deps, $(t_m),$(t_r)))) \

  ) \

)
@@ -807,7 +807,6 @@ $(foreach m,$(ALL_MODULES), \ 
    )\

    $(eval req_files := $(strip $(req_files)))\

    $(eval mod_files := $(filter $(HOST_OUT)/%, $(call module-installed-files,$(m)))) \

    $(eval mod_files := $(filter-out $(req_files),$(mod_files)))\

    $(if $(mod_files),\

      $(eval $(call add-required-deps, $(mod_files),$(req_files))) \

    )\
@@ -836,7 +835,6 @@ $(foreach m,$(ALL_MODULES), \ 
    )\

    $(eval req_files := $(strip $(req_files)))\

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

    $(eval mod_files := $(filter-out $(req_files),$(mod_files)))\

    $(if $(mod_files),\

      $(eval $(call add-required-deps, $(mod_files),$(req_files))) \

    )\