summaryrefslogtreecommitdiff
path: root/android/bazel_handler.go
diff options
context:
space:
mode:
author Jason Wu <juu@google.com> 2022-10-21 02:57:41 -0400
committer Jason Wu <juu@google.com> 2022-10-26 17:07:48 -0400
commit6fe8721e1210c28585934e32c66c24a49f08b877 (patch)
tree3dd0240a60bdcfa836606b2ad617a012abf81e41 /android/bazel_handler.go
parent706d35fe7c6b7d89d7d57beeec5d6f988eb19674 (diff)
Use proto output instead of jsonproto output for aquery
Test: use m --bazel-mode-dev and mixed_droid.sh Bug: 233798334 Change-Id: Ib945359d3d05e6f51afe70432ec380e4e584175b
Diffstat (limited to 'android/bazel_handler.go')
-rw-r--r--android/bazel_handler.go3
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)