diff options
| author | Ying Wang <wangying@google.com> | 2013-08-02 17:40:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-02 17:40:59 -0700 |
| commit | 4a0929e3590b08838280bffae56d357a6194260e (patch) | |
| tree | 55daf036fcdc8d29981894ab19955afe44249742 /core | |
| parent | 79ee17eaa4c47d4786b9d40043e630f1e773b293 (diff) | |
| parent | 387751401ca83e4419444247a176f2ea1f35a50b (diff) | |
| download | build-4a0929e3590b08838280bffae56d357a6194260e.zip build-4a0929e3590b08838280bffae56d357a6194260e.tar.gz build-4a0929e3590b08838280bffae56d357a6194260e.tar.bz2 | |
am 38775140: am 08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev
* commit '387751401ca83e4419444247a176f2ea1f35a50b':
Remove unnecessary dependencies between host and target modules.
Diffstat (limited to 'core')
| -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 3a432de..282d9c3 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))) \ |