diff options
| author | 2020-11-26 09:15:09 +0000 | |
|---|---|---|
| committer | 2020-11-26 09:15:09 +0000 | |
| commit | 463ab7a27edb35e31ca741cd0f546b7cbeec08d6 (patch) | |
| tree | bd5f475ca70adba185e1bfc1b73266f136ffe855 /rust/project_json.go | |
| parent | 5bbec1a3718c7dc25f96b5e03d95fef93947578a (diff) | |
| parent | 3c5905b0cbed94c2b8f5543a14cdc1af2db8acaf (diff) | |
Merge "Ignore variant dependencies in rust-project.json"
Diffstat (limited to 'rust/project_json.go')
| -rw-r--r-- | rust/project_json.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/rust/project_json.go b/rust/project_json.go index 569740831..8d9e50ca9 100644 --- a/rust/project_json.go +++ b/rust/project_json.go @@ -109,6 +109,10 @@ func (singleton *projectGeneratorSingleton) mergeDependencies(ctx android.Single if !ok { return } + // Skip intra-module dependencies (i.e., generated-source library depending on the source variant). + if module.Name() == child.Name() { + return + } if _, ok = deps[ctx.ModuleName(child)]; ok { return } |