From 4f9b25e410ed63028945e47386b434ed8cd8c313 Mon Sep 17 00:00:00 2001
From: Alexander Aprelev <aam@google.com>
Date: Thu, 22 Jun 2017 13:17:50 -0700
Subject: [PATCH] Fix previous CL where dart_bootstrap was accidently changed
 to dart_bootstrap_host_arch.

Also fix two missed places where host_toolchain should be replaced with dart_host_toolchain.

R=rmacnak@google.com

BUG:flutter/flutter#10841
Review-Url: https://codereview.chromium.org/2953873002 .
---
 BUILD.gn                     | 6 ++++--
 utils/generate_patch_sdk.gni | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 6b0eb2ed56f..5671590c18e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -2,6 +2,8 @@
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
+import("build/dart_host_toolchain.gni")
+
 # This target will be built if no target is specified when invoking ninja.
 group("default") {
   if (is_fuchsia || is_fuchsia_host) {
@@ -36,7 +38,7 @@ group("runtime") {
   }
   deps = [
     "runtime/bin:dart",
-    "runtime/bin:dart_bootstrap($host_toolchain)",
+    "runtime/bin:dart_bootstrap($dart_host_toolchain)",
     "runtime/bin:process_test",
     "runtime/bin:run_vm_tests",
     "runtime/bin:sample_extension",
@@ -60,7 +62,7 @@ group("runtime_kernel") {
 
 group("runtime_precompiled") {
   deps = [
-    "runtime/bin:dart_bootstrap($host_toolchain)",
+    "runtime/bin:dart_bootstrap($dart_host_toolchain)",
     "runtime/bin:dart_precompiled_runtime",
     "runtime/bin:process_test",
     "runtime/vm:patched_sdk",
diff --git a/utils/generate_patch_sdk.gni b/utils/generate_patch_sdk.gni
index 2009bffc62f..ad131f9cf20 100644
--- a/utils/generate_patch_sdk.gni
+++ b/utils/generate_patch_sdk.gni
@@ -29,7 +29,7 @@ template("generate_patched_sdk") {
     }
 
     if (!prebuilt_dart_exe_works) {
-      deps += [ "$_dart_root/runtime/bin:dart_bootstrap_host_arch($dart_host_toolchain)" ]
+      deps += [ "$_dart_root/runtime/bin:dart_bootstrap($dart_host_toolchain)" ]
     }
 
     script = "$_dart_root/tools/patch_sdk.py"
@@ -50,7 +50,7 @@ template("generate_patched_sdk") {
     args = [ "--quiet" ]
     if (!prebuilt_dart_exe_works) {
       dart_out_dir = get_label_info(
-              "$_dart_root/runtime/bin:dart_bootstrap_host_arch($dart_host_toolchain)",
+              "$_dart_root/runtime/bin:dart_bootstrap($dart_host_toolchain)",
               "root_out_dir")
       dart_bootstrap =
           rebase_path("$dart_out_dir/dart_bootstrap$executable_suffix")