commit 08c07c590322e1cbc8464dd371a2e5120b88e38d
author Ying Wang <wangying@google.com> Fri Aug 02 21:51:09 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 02 21:51:10 2013 +0000
tree 7a54bf45d2b47433fb44d6ebadc01ab680606482
parent 3fc8dacd9209a846de34edaee0dc14d50cae3d25
parent 16b92edc386a4616b813af392ba54ad9e2c05ca7

Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 3a432de..282d9c3 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -547,10 +547,20 @@
   $(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))) \