summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Liz Kammer <eakammer@google.com> 2021-08-02 16:38:29 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-08-02 16:38:29 +0000
commit93f51a3cff77664652fd68181304368da8e4b44c (patch)
tree5116940e761e2d5c626baac8cf7d9b1f907913d6
parent1b05df5fd4a05fa846e64826073dc52ee069e4a2 (diff)
parentc0c6609ef6bd0389ee02ac91dadec34f63f5a3a4 (diff)
Merge "Set mixed builds use product-config based target"
-rw-r--r--android/bazel_handler.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/bazel_handler.go b/android/bazel_handler.go
index c6364af8a..341d500d7 100644
--- a/android/bazel_handler.go
+++ b/android/bazel_handler.go
@@ -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