StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Setup ANDROID_RUST_VERSION env variable" am: 22af74eafd

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1597935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7993b91eed86d0811f10c20dde09741e4394e22c
This commit is contained in:
Jeffrey Vander Stoep
2021-02-23 15:17:50 +00:00
committed by Automerger Merge Worker
parent 4191ec7529 22af74eafd
commit 0d2bc64075
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rust/builder.go
View File

@@ -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{