Reapply "[fuchsia] Prepare for setting the Dart target architecture appropriately in the host binar…

utils/generate_patch_sdk.gni

Index: utils/generate_patch_sdk.gni
diff --git a/utils/generate_patch_sdk.gni b/utils/generate_patch_sdk.gni
index 31286f268812789e0785b6f5b594f52836530511..4ec995784dd982469c7308f03bbbecee89a65228 100644
--- a/utils/generate_patch_sdk.gni
+++ b/utils/generate_patch_sdk.gni
@@ -16,12 +16,11 @@ _dart_root = get_path_info("..", "abspath")
 #   - deps: extra dependencies that must be built ahead of time.
 template("generate_patched_sdk") {
   assert(defined(invoker.input_patches_dir),
-      "Need input_patches_dir in $target_name")
+         "Need input_patches_dir in $target_name")
   assert(defined(invoker.patched_sdk_dir),
-      "Need patched_sdk_dir in $target_name")
+         "Need patched_sdk_dir in $target_name")
   assert(defined(invoker.mode), "Need mode in $target_name")
   action(target_name) {
-
     if (defined(invoker.deps)) {
       deps = invoker.deps
     } else {
@@ -29,7 +28,7 @@ template("generate_patched_sdk") {
     }
 
     if (!prebuilt_dart_exe_works) {
-      deps += ["$_dart_root/runtime/bin:dart_bootstrap($host_toolchain)"]
+      deps += [ "$_dart_root/runtime/bin:dart_bootstrap_host_arch($host_toolchain)" ]
     }
 
     script = "$_dart_root/tools/patch_sdk.py"
@@ -50,10 +49,10 @@ template("generate_patched_sdk") {
     args = [ "--quiet" ]
     if (!prebuilt_dart_exe_works) {
       dart_out_dir = get_label_info(
-          "$_dart_root/runtime/bin:dart_bootstrap($host_toolchain)",
-          "root_out_dir")
-      dart_bootstrap =
-          rebase_path("$dart_out_dir/dart_bootstrap$executable_suffix")
+              "$_dart_root/runtime/bin:dart_bootstrap_host_arch($host_toolchain)",
+              "root_out_dir")
+      dart_bootstrap = rebase_path(
+              "$dart_out_dir/dart_bootstrap_host_arch$executable_suffix")
       args += [
         "--dart-executable",
         dart_bootstrap,
@@ -68,4 +67,3 @@ template("generate_patched_sdk") {
     ]
   }
 }
-