Merge "Remove --extra_toolchains flag from aquery runner" am: 9ba1ddd355

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2496175

Change-Id: I73361029b4aa5af64732eb7f95c2419aee66ed29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-18 23:31:29 +00:00
committed by Automerger Merge Worker

View File

@@ -736,15 +736,6 @@ func (r *builtinBazelRunner) createBazelCommand(config Config, paths *bazelPaths
// TODO(asmundak): is it needed in every build?
"--profile=" + shared.BazelMetricsFilename(paths, runName),
// Set default platforms to canonicalized values for mixed builds requests.
// If these are set in the bazelrc, they will have values that are
// non-canonicalized to @sourceroot labels, and thus be invalid when
// referenced from the buildroot.
//
// 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"),
// We don't need to set --host_platforms because it's set in bazelrc files
// that the bazel shell script wrapper passes