diff options
| author | Ying Wang <wangying@google.com> | 2014-01-31 19:22:35 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-01-31 19:22:35 -0800 |
| commit | 3136010cddcfbb20bdbc6d74d33fcc06f535dd47 (patch) | |
| tree | 789ecbfc41a8571d4bed4411ef685242a93301eb /core/main.mk | |
| parent | 5608a8c6e86381cdabc46c3a9b90564411771796 (diff) | |
| download | build-3136010cddcfbb20bdbc6d74d33fcc06f535dd47.zip build-3136010cddcfbb20bdbc6d74d33fcc06f535dd47.tar.gz build-3136010cddcfbb20bdbc6d74d33fcc06f535dd47.tar.bz2 | |
Dedup the targets and dependencies of required modules.
For whatever reason, two modules may have the same file as their
installed module. In that case circular dependency is created if the two
modules have requited-by relation.
Change-Id: I15ed271ca3f3c343e4662182ded5ccc63d6c42cc
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/main.mk b/core/main.mk index e2b93c2..b593acd 100644 --- 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)))) \ ) \ |