diff options
| author | 2020-08-03 10:44:18 +0200 | |
|---|---|---|
| committer | 2020-08-04 06:36:20 +0000 | |
| commit | 9b7b8f169a069bd9011fb7a88174044d6c845760 (patch) | |
| tree | fd258e374046d0dad0b253ac9bed1bbe6a89350e /rust/project_json.go | |
| parent | 8b7eb8d86a66de639f2beea8b398e1781d870a6c (diff) | |
Fix dependency merging for rust-project.json
Test: SOONG_GEN_RUST_PROJECT=1 m nothing; inspect rust-project.json
Bug: 159591910
Change-Id: I95beb2e75f2306ae2bf2be02ab5f1a348d134b56
Diffstat (limited to 'rust/project_json.go')
| -rw-r--r-- | rust/project_json.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/rust/project_json.go b/rust/project_json.go index 24e769175..41dd194ee 100644 --- a/rust/project_json.go +++ b/rust/project_json.go @@ -92,7 +92,7 @@ func mergeDependencies(ctx android.SingletonContext, project *rustProjectJson, // appendLibraryAndDeps creates a rustProjectCrate for the module argument and // appends it to the rustProjectJson struct. It visits the dependencies of the // module depth-first. If the current module is already in knownCrates, its -// its dependencies are merged. Returns a tuple (id, crate_name, ok). +// dependencies are merged. Returns a tuple (id, crate_name, ok). func appendLibraryAndDeps(ctx android.SingletonContext, project *rustProjectJson, knownCrates map[string]crateInfo, module android.Module) (int, string, bool) { rModule, ok := module.(*Module) @@ -111,6 +111,7 @@ func appendLibraryAndDeps(ctx android.SingletonContext, project *rustProjectJson // We have seen this crate already; merge any new dependencies. crate := project.Crates[cInfo.ID] mergeDependencies(ctx, project, knownCrates, module, &crate, cInfo.Deps) + project.Crates[cInfo.ID] = crate return cInfo.ID, crateName, true } crate := rustProjectCrate{Deps: make([]rustProjectDep, 0), Cfgs: make([]string, 0)} |