From e81c924f0c70b07fdfac86ef1475622ee6444c36 Mon Sep 17 00:00:00 2001 From: Thiébaud Weksteen Date: Mon, 3 Aug 2020 10:46:28 +0200 Subject: Move getEdition to a baseCompiler method Test: cd build/soong; mma Test: cd external/rust/; mma Change-Id: Ide63b2e633e7c4345c6338e107f5d66688e4cf58 --- rust/project_json.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rust/project_json.go') 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) -- cgit v1.2.3-59-g8ed1b