openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Set PATH and --action_env=PATH for the Bazel build in soong_ui."

This commit is contained in:
Jingwen Chen 2020-11-16 23:51:10 +00:00 committed by Gerrit Code Review
parent 1af783fae7 3a4b58dc5d
commit 556dafcdbf
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/build/bazel.go
View File

@ -24,6 +24,8 @@ import (
"android/soong/ui/metrics"
)
// Main entry point to construct the Bazel build command line, environment variables
// and post-processing steps (e.g. converge output directories)
func runBazel(ctx Context, config Config) {
ctx.BeginTrace(metrics.RunBazel, "bazel")
defer ctx.EndTrace()
@ -67,6 +69,10 @@ func runBazel(ctx Context, config Config) {
"//:"+config.TargetProduct()+"-"+config.TargetBuildVariant(),
)
if pathEnvValue, ok := config.environ.Get("PATH"); ok {
cmd.Environment.Set("PATH", pathEnvValue)
cmd.Args = append(cmd.Args, "--action_env=PATH="+pathEnvValue)
}
cmd.Environment.Set("DIST_DIR", config.DistDir())
cmd.Environment.Set("SHELL", "/bin/bash")