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 "Allow extra startup and build args to be passed to Bazel."

This commit is contained in:
Treehugger Robot 2020-11-10 07:22:34 +00:00 committed by Gerrit Code Review
parent 8b16e407e2 f8ae317d3e
commit ccd3f1d66f
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ui/build/bazel.go
View File

@ -34,13 +34,24 @@ func runBazel(ctx Context, config Config) {
}
bazelExecutable := filepath.Join("tools", "bazel")
args := []string{
"build",
"--output_groups=" + outputGroups,
"//:" + config.TargetProduct() + "-" + config.TargetBuildVariant(),
cmd := Command(ctx, config, "bazel", bazelExecutable)
if extra_startup_args, ok := cmd.Environment.Get("BAZEL_STARTUP_ARGS"); ok {
cmd.Args = append(cmd.Args, strings.Fields(extra_startup_args)...)
}
cmd := Command(ctx, config, "bazel", bazelExecutable, args...)
cmd.Args = append(cmd.Args,
"build",
"--output_groups="+outputGroups,
)
if extra_build_args, ok := cmd.Environment.Get("BAZEL_BUILD_ARGS"); ok {
cmd.Args = append(cmd.Args, strings.Fields(extra_build_args)...)
}
cmd.Args = append(cmd.Args,
"//:"+config.TargetProduct()+"-"+config.TargetBuildVariant(),
)
cmd.Environment.Set("DIST_DIR", config.DistDir())
cmd.Environment.Set("SHELL", "/bin/bash")
@ -51,12 +62,16 @@ func runBazel(ctx Context, config Config) {
cmd.RunAndStreamOrFatal()
// Obtain the Bazel output directory for ninja_build.
infoArgs := []string{
"info",
"output_path",
infoCmd := Command(ctx, config, "bazel", bazelExecutable)
if extra_startup_args, ok := infoCmd.Environment.Get("BAZEL_STARTUP_ARGS"); ok {
infoCmd.Args = append(infoCmd.Args, strings.Fields(extra_startup_args)...)
}
infoCmd := Command(ctx, config, "bazel", bazelExecutable, infoArgs...)
infoCmd.Args = append(infoCmd.Args,
"info",
"output_path",
)
infoCmd.Environment.Set("DIST_DIR", config.DistDir())
infoCmd.Environment.Set("SHELL", "/bin/bash")