diff options
| author | Thiébaud Weksteen <tweek@google.com> | 2020-08-03 10:46:28 +0200 |
|---|---|---|
| committer | Thiébaud Weksteen <tweek@google.com> | 2020-08-03 11:00:43 +0200 |
| commit | e81c924f0c70b07fdfac86ef1475622ee6444c36 (patch) | |
| tree | 7ee2fe380092ffaf14e8e31aa8357dc7f99e7b4c /rust/project_json.go | |
| parent | d118b1c2b74a1028f86f570db602a3b39e2009e1 (diff) | |
Move getEdition to a baseCompiler method
Test: cd build/soong; mma
Test: cd external/rust/; mma
Change-Id: Ide63b2e633e7c4345c6338e107f5d66688e4cf58
Diffstat (limited to 'rust/project_json.go')
| -rw-r--r-- | rust/project_json.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/project_json.go b/rust/project_json.go index a50e73a95..24e769175 100644 --- a/rust/project_json.go +++ b/rust/project_json.go @@ -116,7 +116,7 @@ func appendLibraryAndDeps(ctx android.SingletonContext, project *rustProjectJson crate := rustProjectCrate{Deps: make([]rustProjectDep, 0), Cfgs: make([]string, 0)} src := rustLib.baseCompiler.Properties.Srcs[0] crate.RootModule = path.Join(ctx.ModuleDir(rModule), src) - crate.Edition = getEdition(rustLib.baseCompiler) + crate.Edition = rustLib.baseCompiler.edition() deps := make(map[string]int) mergeDependencies(ctx, project, knownCrates, module, &crate, deps) |