StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed commented out code

Browse Source 
A previous CL commented out code instead of removing it.  This CL fixes
this grave error.

Test: TH
Change-Id: I1daeaaa1ad90230aec639d603e7cdb9b61af251a
This commit is contained in:
Chris Wailes
2021-08-10 10:21:02 -07:00
parent 353405d9fb
commit 90c4b14a30
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rust/project_json.go
View File

@@ -54,7 +54,6 @@ type rustProjectCrate struct {
} }
type rustProjectJson struct { type rustProjectJson struct {
// Roots []string `json:"roots"`
Crates []rustProjectCrate `json:"crates"` Crates []rustProjectCrate `json:"crates"`
} }
@@ -248,9 +247,6 @@ func (singleton *projectGeneratorSingleton) addCrate(ctx android.SingletonContex
idx := len(singleton.project.Crates) idx := len(singleton.project.Crates)
singleton.knownCrates[rModule.Name()] = crateInfo{Idx: idx, Deps: deps} singleton.knownCrates[rModule.Name()] = crateInfo{Idx: idx, Deps: deps}
singleton.project.Crates = append(singleton.project.Crates, crate) 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))
return idx, true return idx, true
} }