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

Commit 16b92edc authored by Ying Wang's avatar Ying Wang
Browse files

Remove unnecessary dependencies between host and target modules. 

With this change, modules introduced by LOCAL_REQUIRED_MODULES will be
split by host/target: target modules only depend on target modules and
host modules only depend on host modules.

Bug: 9303948
Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
parent 94de1eba

core/main.mk

+11 −1
Original line number Diff line number Diff line
@@ -547,10 +547,20 @@ $(foreach m,$(ALL_MODULES), \ 
  $(eval r := $(ALL_MODULES.$(m).REQUIRED)) \

  $(if $(r), \

    $(eval r := $(call module-installed-files,$(r))) \

    $(eval $(call add-required-deps,$(ALL_MODULES.$(m).INSTALLED),$(r))) \

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

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

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

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

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

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

   ) \

 )



t_m :=

h_m :=

t_r :=

h_r :=



# Resolve the dependencies on shared libraries.

$(foreach m,$(TARGET_DEPENDENCIES_ON_SHARED_LIBRARIES), \

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