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

runtime/bin/BUILD.gn

Index: runtime/bin/BUILD.gn
diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn
index 8d56d3f7b34958db96b428548f2f13c5507b1ee8..1a4907c3a7d789919de4a0123d4128615d934018 100644
--- a/runtime/bin/BUILD.gn
+++ b/runtime/bin/BUILD.gn
@@ -274,6 +274,7 @@ executable("gen_snapshot") {
     "..:dart_config",
     "..:dart_maybe_product_config",
     "..:dart_precompiler_config",
+    "..:dart_use_target_arch_config",
   ]
   deps = [
     ":gen_resources_cc",
@@ -668,6 +669,7 @@ template("dart_executable") {
 }
 
 dart_executable("dart") {
+  extra_configs = [ "..:dart_use_target_arch_config" ]
   extra_deps = [
     "..:libdart_jit",
     ":dart_snapshot_cc",
@@ -696,57 +698,72 @@ dart_executable("dart_precompiled_runtime") {
   ]
 }
 
-dart_executable("dart_bootstrap") {
-  extra_configs = [
-    "..:dart_precompiler_config",
-    "..:dart_no_snapshot_config",
-  ]
-  extra_deps = [
-    ":generate_builtin_cc_file",
-    ":generate_io_cc_file",
-    ":generate_io_patch_cc_file",
-    ":generate_html_cc_file",
-    ":generate_html_common_cc_file",
-    ":generate_js_cc_file",
-    ":generate_js_util_cc_file",
-    ":generate_blink_cc_file",
-    ":generate_indexed_db_cc_file",
-    ":generate_cached_patches_cc_file",
-    ":generate_web_gl_cc_file",
-    ":generate_metadata_cc_file",
-    ":generate_web_sql_cc_file",
-    ":generate_svg_cc_file",
-    ":generate_web_audio_cc_file",
-    "..:libdart_nosnapshot_with_precompiler",
-  ]
-  extra_defines = [ "NO_OBSERVATORY" ]
-  extra_sources = [
-    "builtin.cc",
-    "builtin.h",
-    "dfe.cc",
-    "dfe.h",
-    "loader.cc",
-    "loader.h",
-    "observatory_assets_empty.cc",
-    "snapshot_empty.cc",
+template("dart_bootstrap_template") {
+  invoker_extra_configs = []
+  if (defined(invoker.extra_configs)) {
+    invoker_extra_configs += invoker.extra_configs
+  }
+  dart_executable(target_name) {
+    extra_configs = [
+                      "..:dart_precompiler_config",
+                      "..:dart_no_snapshot_config",
+                    ] + invoker_extra_configs
+    extra_deps = [
+      ":generate_builtin_cc_file",
+      ":generate_io_cc_file",
+      ":generate_io_patch_cc_file",
+      ":generate_html_cc_file",
+      ":generate_html_common_cc_file",
+      ":generate_js_cc_file",
+      ":generate_js_util_cc_file",
+      ":generate_blink_cc_file",
+      ":generate_indexed_db_cc_file",
+      ":generate_cached_patches_cc_file",
+      ":generate_web_gl_cc_file",
+      ":generate_metadata_cc_file",
+      ":generate_web_sql_cc_file",
+      ":generate_svg_cc_file",
+      ":generate_web_audio_cc_file",
+      "..:libdart_nosnapshot_with_precompiler",
+    ]
+    extra_defines = [ "NO_OBSERVATORY" ]
+    extra_sources = [
+      "builtin.cc",
+      "builtin.h",
+      "dfe.cc",
+      "dfe.h",
+      "loader.cc",
+      "loader.h",
+      "observatory_assets_empty.cc",
+      "snapshot_empty.cc",
+
+      # Include generated source files.
+      "$target_gen_dir/builtin_gen.cc",
+      "$target_gen_dir/io_gen.cc",
+      "$target_gen_dir/io_patch_gen.cc",
+      "$target_gen_dir/html_gen.cc",
+      "$target_gen_dir/html_common_gen.cc",
+      "$target_gen_dir/js_gen.cc",
+      "$target_gen_dir/js_util_gen.cc",
+      "$target_gen_dir/blink_gen.cc",
+      "$target_gen_dir/indexed_db_gen.cc",
+      "$target_gen_dir/cached_patches_gen.cc",
+      "$target_gen_dir/web_gl_gen.cc",
+      "$target_gen_dir/metadata_gen.cc",
+      "$target_gen_dir/web_sql_gen.cc",
+      "$target_gen_dir/svg_gen.cc",
+      "$target_gen_dir/web_audio_gen.cc",
+    ]
+  }
+}
 
-    # Include generated source files.
-    "$target_gen_dir/builtin_gen.cc",
-    "$target_gen_dir/io_gen.cc",
-    "$target_gen_dir/io_patch_gen.cc",
-    "$target_gen_dir/html_gen.cc",
-    "$target_gen_dir/html_common_gen.cc",
-    "$target_gen_dir/js_gen.cc",
-    "$target_gen_dir/js_util_gen.cc",
-    "$target_gen_dir/blink_gen.cc",
-    "$target_gen_dir/indexed_db_gen.cc",
-    "$target_gen_dir/cached_patches_gen.cc",
-    "$target_gen_dir/web_gl_gen.cc",
-    "$target_gen_dir/metadata_gen.cc",
-    "$target_gen_dir/web_sql_gen.cc",
-    "$target_gen_dir/svg_gen.cc",
-    "$target_gen_dir/web_audio_gen.cc",
-  ]
+dart_bootstrap_template("dart_bootstrap") {
+  extra_configs = [ "..:dart_use_target_arch_config" ]
+}
+
+# TODO(rmacnak): Remove if Fuchsia adds a checked-in SDK.
+dart_bootstrap_template("dart_bootstrap_host_arch") {
+  extra_configs = []
 }
 
 if (is_fuchsia) {
@@ -835,6 +852,7 @@ executable("run_vm_tests") {
   configs += [
     "..:dart_config",
     "..:dart_maybe_product_config",
+    "..:dart_use_target_arch_config",

[rmacnak, 2017/06/12 23:59:57]

Here

   ]
 
   deps = [