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

Merge "Set --noautodetect_server_javabase in mixed build bazel."

Browse Source
This commit is contained in:
Romain Jobredeaux
2021-08-27 20:53:47 +00:00
committed by Gerrit Code Review
parent 274aca4464 41fd5e402f
commit e4447e4e97
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
android/bazel_handler.go
View File

@@ -353,7 +353,16 @@ type builtinBazelRunner struct{}
// the invocation returned an error code. // the invocation returned an error code.
func (r *builtinBazelRunner) issueBazelCommand(paths *bazelPaths, runName bazel.RunName, command bazelCommand, func (r *builtinBazelRunner) issueBazelCommand(paths *bazelPaths, runName bazel.RunName, command bazelCommand,
extraFlags ...string) (string, string, error) { extraFlags ...string) (string, string, error) {
cmdFlags := []string{"--output_base=" + absolutePath(paths.outputBase), command.command} cmdFlags := []string{
// --noautodetect_server_javabase has the practical consequence of preventing Bazel from
// attempting to download rules_java, which is incompatible with
// --experimental_repository_disable_download set further below.
// rules_java is also not needed until mixed builds start building java targets.
// TODO(b/197958133): Once rules_java is pulled into AOSP, remove this flag.
"--noautodetect_server_javabase",
"--output_base=" + absolutePath(paths.outputBase),
command.command,
}
cmdFlags = append(cmdFlags, command.expression) cmdFlags = append(cmdFlags, command.expression)
cmdFlags = append(cmdFlags, "--profile="+shared.BazelMetricsFilename(paths, runName)) cmdFlags = append(cmdFlags, "--profile="+shared.BazelMetricsFilename(paths, runName))