From 3c5905b0cbed94c2b8f5543a14cdc1af2db8acaf Mon Sep 17 00:00:00 2001 From: Thiébaud Weksteen Date: Wed, 25 Nov 2020 16:09:32 +0100 Subject: Ignore variant dependencies in rust-project.json Source-generated library modules will have a dependency on the source variant. This creates a cycle in the dependency graph which triggers a warning from rust-analyzer. Ignore this type of dependency. Test: m nothing Change-Id: I13365093ebb88b00f6a72734b01114ec3e9a320e --- rust/project_json.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'rust/project_json.go') 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 } -- cgit v1.2.3-59-g8ed1b