From 353405d9fbea50ef6b314df8f08622a996a15774 Mon Sep 17 00:00:00 2001 From: Chris Wailes Date: Mon, 9 Aug 2021 15:49:11 -0700 Subject: [PATCH] Clean up generated rust-project.json files This CL removes the roots section from the rust-projects.json file as it is no longer required by the rust-analyzer tool. Bug: 162055556 Test: prebuilts/rust/tests/rust-analyzer-integration-test.sh Change-Id: I85c3277632c88394bc52e709ecce83f6aa1f2e0e --- rust/project_json.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/project_json.go b/rust/project_json.go index c28bc7b76..e15ec0f22 100644 --- a/rust/project_json.go +++ b/rust/project_json.go @@ -54,7 +54,7 @@ type rustProjectCrate struct { } type rustProjectJson struct { - Roots []string `json:"roots"` + // Roots []string `json:"roots"` Crates []rustProjectCrate `json:"crates"` } @@ -250,7 +250,7 @@ func (singleton *projectGeneratorSingleton) addCrate(ctx android.SingletonContex singleton.project.Crates = append(singleton.project.Crates, crate) // rust-analyzer requires that all crates belong to at least one root: // https://github.com/rust-analyzer/rust-analyzer/issues/4735. - singleton.project.Roots = append(singleton.project.Roots, path.Dir(crate.RootModule)) + // singleton.project.Roots = append(singleton.project.Roots, path.Dir(crate.RootModule)) return idx, true }