Mostly revert "[fuchsia] Prepare for setting the Dart target architecture appropriately in the host…

runtime/vm/BUILD.gn

 # Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 # 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/executable_suffix.gni")
 import("../../build/prebuilt_dart_sdk.gni")
 import("../../utils/generate_patch_sdk.gni")
 import("gypi_contents.gni")
 import("../runtime_args.gni")
 
@@ skipping 31 matching lines @@
 
   include_dirs = [ ".." ]
 }
 
 vm_sources_list = processed_gypis.vm_sources
 
 static_library("libdart_vm_jit") {
   configs += [
     "..:dart_config",
     "..:dart_maybe_product_config",
-    "..:dart_use_target_arch_config",
   ]
   if (is_fuchsia) {
     configs -= [ "//build/config:symbol_visibility_hidden" ]
   }
   public_configs = [ ":libdart_vm_config" ]
   set_sources_assignment_filter([
                                   "*_test.cc",
                                   "*_test.h",
                                 ])
   sources = vm_sources_list
   include_dirs = [ ".." ]
 }
 
 static_library("libdart_vm_precompiled_runtime") {
   configs += [
     "..:dart_config",
     "..:dart_maybe_product_config",
     "..:dart_precompiled_runtime_config",
-    "..:dart_use_target_arch_config",
   ]
   if (is_fuchsia) {
     configs -= [ "//build/config:symbol_visibility_hidden" ]
   }
   public_configs = [ ":libdart_vm_config" ]
   set_sources_assignment_filter([
                                   "*_test.cc",
                                   "*_test.h",
                                 ])
   sources = vm_sources_list
   include_dirs = [ ".." ]
 }
 
 static_library("libdart_vm_nosnapshot") {
   configs += [
     "..:dart_config",
     "..:dart_maybe_product_config",
     "..:dart_no_snapshot_config",
-    "..:dart_use_target_arch_config",
   ]
   if (is_fuchsia) {
     configs -= [ "//build/config:symbol_visibility_hidden" ]
   }
   public_configs = [ ":libdart_vm_config" ]
   set_sources_assignment_filter([
                                   "*_test.cc",
                                   "*_test.h",
                                 ])
   sources = vm_sources_list
   include_dirs = [ ".." ]
 }
 
 static_library("libdart_vm_nosnapshot_with_precompiler") {
   configs += [
     "..:dart_config",
     "..:dart_maybe_product_config",
-    "..:dart_precompiler_config",
-    "..:dart_no_snapshot_config",
-    "..:dart_use_target_arch_config",
-  ]
-  if (is_fuchsia) {
-    configs -= [ "//build/config:symbol_visibility_hidden" ]
-  }
-  public_configs = [ ":libdart_vm_config" ]
-  set_sources_assignment_filter([
-                                  "*_test.cc",
-                                  "*_test.h",
-                                ])
-  sources = vm_sources_list
-  include_dirs = [ ".." ]
-}
-
-static_library("libdart_vm_nosnapshot_with_precompiler_host_arch") {
-  configs += [
-    "..:dart_config",
-    "..:dart_maybe_product_config",
     "..:dart_precompiler_config",
     "..:dart_no_snapshot_config",
   ]
   if (is_fuchsia) {
     configs -= [ "//build/config:symbol_visibility_hidden" ]
   }
   public_configs = [ ":libdart_vm_config" ]
   set_sources_assignment_filter([
                                   "*_test.cc",
                                   "*_test.h",
                                 ])
   sources = vm_sources_list
   include_dirs = [ ".." ]
 }
 
 static_library("libdart_vm_with_precompiler") {
   configs += [
     "..:dart_config",
     "..:dart_maybe_product_config",
     "..:dart_precompiler_config",
-    "..:dart_use_target_arch_config",
   ]
   if (is_fuchsia) {
     configs -= [ "//build/config:symbol_visibility_hidden" ]
   }
   public_configs = [ ":libdart_vm_config" ]
   set_sources_assignment_filter([
                                   "*_test.cc",
                                   "*_test.h",
                                 ])
   sources = vm_sources_list
@@ skipping 92 matching lines @@
       libdeps += [ ":generate_${filename}_patch_cc_file" ]
     }
   }
 
   all_libsources = rebase_path(invoker.allsources, ".", "../lib")
 
   static_library("libdart_lib_nosnapshot_with_precompiler") {
     configs += [
       "..:dart_config",
       "..:dart_maybe_product_config",
-      "..:dart_precompiler_config",
-      "..:dart_use_target_arch_config",
-    ]
-    if (is_fuchsia) {
-      configs -= [ "//build/config:symbol_visibility_hidden" ]
-    }
-    deps = libdeps
-    sources = all_libsources + [ "bootstrap.cc" ] + liboutputs
-    include_dirs = [ ".." ]
-  }
-
-  static_library("libdart_lib_nosnapshot_with_precompiler_host_arch") {
-    configs += [
-      "..:dart_config",
-      "..:dart_maybe_product_config",
       "..:dart_precompiler_config",
     ]
     if (is_fuchsia) {
       configs -= [ "//build/config:symbol_visibility_hidden" ]
     }
     deps = libdeps
     sources = all_libsources + [ "bootstrap.cc" ] + liboutputs
     include_dirs = [ ".." ]
   }
 
   static_library("libdart_lib_with_precompiler") {
     configs += [
       "..:dart_config",
       "..:dart_maybe_product_config",
       "..:dart_precompiler_config",
-      "..:dart_use_target_arch_config",
     ]
     if (is_fuchsia) {
       configs -= [ "//build/config:symbol_visibility_hidden" ]
     }
     deps = libdeps
     sources = all_libsources + [ "bootstrap_nocore.cc" ]
     include_dirs = [ ".." ]
   }
 
   static_library("libdart_lib_jit") {
     configs += [
       "..:dart_config",
       "..:dart_maybe_product_config",
-      "..:dart_use_target_arch_config",
     ]
     if (is_fuchsia) {
       configs -= [ "//build/config:symbol_visibility_hidden" ]
     }
     sources = all_libsources + [ "bootstrap_nocore.cc" ]
     include_dirs = [ ".." ]
   }
 
   static_library("libdart_lib_precompiled_runtime") {
     configs += [
       "..:dart_config",
       "..:dart_maybe_product_config",
       "..:dart_precompiled_runtime_config",
-      "..:dart_use_target_arch_config",
     ]
     if (is_fuchsia) {
       configs -= [ "//build/config:symbol_visibility_hidden" ]
     }
     sources = all_libsources + [ "bootstrap_nocore.cc" ]
     include_dirs = [ ".." ]
   }
 }
 
 generate_core_libraries("core_libraries") {
@@ skipping 213 matching lines @@
       processed_gypis.vmservice_runtime_sources,
       "../lib",
     ],
     [
       "io",
       processed_gypis.bin_io_sources,
       "../bin",
     ],
   ]
 }