Merge "Set mixed builds use product-config based target" am: 93f51a3cff

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

Change-Id: I8ac7d712f534ffb0dfad25a03c1cc00639cf91fe
This commit is contained in:
Liz Kammer
2021-08-02 16:42:00 +00:00
committed by Automerger Merge Worker

View File

@@ -333,7 +333,7 @@ func (r *builtinBazelRunner) issueBazelCommand(paths *bazelPaths, runName bazel.
// The actual platform values here may be overridden by configuration
// transitions from the buildroot.
cmdFlags = append(cmdFlags,
fmt.Sprintf("--platforms=%s", "//build/bazel/platforms:android_arm"))
fmt.Sprintf("--platforms=%s", "//build/bazel/platforms:android_target"))
cmdFlags = append(cmdFlags,
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