diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-03-11 19:08:45 +0000 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2021-03-16 00:44:22 +0000 |
| commit | 85534c36f81cf1557ddaa01605199bfc3a9fd76c (patch) | |
| tree | f9b65ea011ac58731bc866a621f526ea8fa7e39f /rust/builder.go | |
| parent | 5989878a55d2d34a1a8e5e16bb37349c4949758b (diff) | |
| parent | edc1fc38c73698499b37c40435b25ef2a5ade887 (diff) | |
Merge SP1A.210311.001
Change-Id: I28e9aad9ed4dd91092fd24efb136f0aac7bdb68e
Diffstat (limited to 'rust/builder.go')
| -rw-r--r-- | rust/builder.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/rust/builder.go b/rust/builder.go index 547d70569..632612457 100644 --- a/rust/builder.go +++ b/rust/builder.go @@ -230,6 +230,8 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl envVars = append(envVars, "OUT_DIR="+filepath.Join(outDirPrefix, moduleGenDir.String())) } + envVars = append(envVars, "ANDROID_RUST_VERSION="+config.RustDefaultVersion) + if flags.Clippy { clippyFile := android.PathForModuleOut(ctx, outputFile.Base()+".clippy") ctx.Build(pctx, android.BuildParams{ |