diff options
Diffstat (limited to 'rust/project_json.go')
| -rw-r--r-- | rust/project_json.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/rust/project_json.go b/rust/project_json.go index 75375408c..41dd194ee 100644 --- a/rust/project_json.go +++ b/rust/project_json.go @@ -75,6 +75,7 @@ func mergeDependencies(ctx android.SingletonContext, project *rustProjectJson, knownCrates map[string]crateInfo, module android.Module, crate *rustProjectCrate, deps map[string]int) { + //TODO(tweek): The stdlib dependencies do not appear here. We need to manually add them. ctx.VisitDirectDeps(module, func(child android.Module) { childId, childName, ok := appendLibraryAndDeps(ctx, project, knownCrates, child) if !ok { @@ -114,11 +115,8 @@ func appendLibraryAndDeps(ctx android.SingletonContext, project *rustProjectJson return cInfo.ID, crateName, true } crate := rustProjectCrate{Deps: make([]rustProjectDep, 0), Cfgs: make([]string, 0)} - srcs := rustLib.baseCompiler.Properties.Srcs - if len(srcs) == 0 { - return 0, "", false - } - crate.RootModule = path.Join(ctx.ModuleDir(rModule), srcs[0]) + src := rustLib.baseCompiler.Properties.Srcs[0] + crate.RootModule = path.Join(ctx.ModuleDir(rModule), src) crate.Edition = rustLib.baseCompiler.edition() deps := make(map[string]int) |