Merge "Dedup the targets and dependencies of required modules."

2014-02-01 03:25:47 +00:00
parent 5608a8c6e8 3136010cdd
commit a77456b8e8
1 changed files with 2 additions and 0 deletions
--- a/core/main.mk
+++ b/core/main.mk
@@ -582,6 +582,8 @@ $(foreach m,$(ALL_MODULES), \
    $(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))) \
+    $(eval t_m := $(filter-out $(t_r), $(t_m))) \
+    $(eval h_m := $(filter-out $(h_r), $(h_m))) \
    $(if $(t_m), $(eval $(call add-required-deps, $(t_m),$(t_r)))) \
    $(if $(h_m), $(eval $(call add-required-deps, $(h_m),$(h_r)))) \
   ) \