Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cdabadd authored by Chris Wailes's avatar Chris Wailes Committed by Automerger Merge Worker
Browse files

Clean up generated rust-project.json files am: 353405d9 am: e1c6783b am: 17c20f5c 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1790960

Change-Id: I47a491cf410f90eae75f17fdb8b9a795365bdea8
parents 496cb48b 17c20f5c

rust/project_json.go

+2 −2
Original line number Diff line number Diff line
@@ -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

}