diff options
| author | Ying Wang <wangying@google.com> | 2013-08-02 21:51:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-02 21:51:10 +0000 |
| commit | 08c07c590322e1cbc8464dd371a2e5120b88e38d (patch) | |
| tree | 7a54bf45d2b47433fb44d6ebadc01ab680606482 | |
| parent | 3fc8dacd9209a846de34edaee0dc14d50cae3d25 (diff) | |
| parent | 16b92edc386a4616b813af392ba54ad9e2c05ca7 (diff) | |
| download | build-08c07c590322e1cbc8464dd371a2e5120b88e38d.tar.gz | |
Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
| -rw-r--r-- | core/main.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/core/main.mk b/core/main.mk index 3a432de0d5..282d9c3f21 100644 --- a/core/main.mk +++ b/core/main.mk @@ -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))) \ |