diff options
Diffstat (limited to 'android/bazel_handler.go')
| -rw-r--r-- | android/bazel_handler.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/android/bazel_handler.go b/android/bazel_handler.go index f16ee60ed..e15a81ef2 100644 --- a/android/bazel_handler.go +++ b/android/bazel_handler.go @@ -558,7 +558,6 @@ func (r *builtinBazelRunner) createBazelCommand(paths *bazelPaths, runName bazel // The actual platform values here may be overridden by configuration // transitions from the buildroot. fmt.Sprintf("--extra_toolchains=%s", "//prebuilts/clang/host/linux-x86:all"), - // This should be parameterized on the host OS, but let's restrict to linux // to keep things simple for now. fmt.Sprintf("--host_platform=%s", "//build/bazel/platforms:linux_x86_64"), @@ -927,7 +926,7 @@ func (context *bazelContext) InvokeBazel(config Config) error { // // Use jsonproto instead of proto; actual proto parsing would require a dependency on Bazel's // proto sources, which would add a number of unnecessary dependencies. - extraFlags := []string{"--output=jsonproto", "--include_file_write_contents"} + extraFlags := []string{"--output=proto", "--include_file_write_contents"} if Bool(config.productVariables.ClangCoverage) { extraFlags = append(extraFlags, "--collect_code_coverage") paths := make([]string, 0, 2) |