summaryrefslogtreecommitdiff
path: root/rust/project_json.go
diff options
context:
space:
mode:
author Chris Wailes <chriswailes@google.com> 2021-08-09 15:49:11 -0700
committer Chris Wailes <chriswailes@google.com> 2021-08-09 15:50:39 -0700
commit353405d9fbea50ef6b314df8f08622a996a15774 (patch)
treed92ef3939c15dd49602a41115e59743e7d5f658b /rust/project_json.go
parent67d6ccecfca566df27d0b07626e29948c0e4d05f (diff)
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
Diffstat (limited to 'rust/project_json.go')
-rw-r--r--rust/project_json.go4
1 files 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
}