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

runtime/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("runtime_args.gni")
 
 declare_args() {
   # Instead of using is_debug, we introduce a different flag for specifying a
   # Debug build of Dart so that clients can still use a Release build of Dart
   # while themselves doing a Debug build.
@@ skipping 54 matching lines @@
 config("dart_precompiler_config") {
   defines = []
   defines += [ "DART_PRECOMPILER" ]
 }
 
 config("dart_no_snapshot_config") {
   defines = []
   defines += [ "DART_NO_SNAPSHOT" ]
 }
 
-# TODO(rmacnak): If Fuchsia adds a checked-in SDK, this should be folded back
-# into dart_config
-config("dart_use_target_arch_config") {
+config("dart_config") {
   defines = []
 
+  if (target_os == "android") {
+    defines += [ "TARGET_OS_ANDROID" ]
+  } else if (target_os == "fuchsia") {
+    defines += [ "TARGET_OS_FUCHSIA" ]
+  } else if (target_os == "ios") {
+    defines += [ "TARGET_OS_MACOS" ]
+    defines += [ "TARGET_OS_MACOS_IOS" ]
+  } else if (target_os == "linux") {
+    defines += [ "TARGET_OS_LINUX" ]
+  } else if (target_os == "mac") {
+    defines += [ "TARGET_OS_MACOS" ]
+  } else if (target_os == "win") {
+    defines += [ "TARGET_OS_WINDOWS" ]
+  } else {
+    print("Unknown target_os: $target_os")
+    assert(false)
+  }
+
   if (dart_target_arch != "") {
     if (dart_target_arch == "arm" || dart_target_arch == "simarm") {
       defines += [ "TARGET_ARCH_ARM" ]
     } else if (dart_target_arch == "armv6" || dart_target_arch == "simarmv6") {
       defines += [ "TARGET_ARCH_ARM" ]
       defines += [ "TARGET_ARCH_ARM_6" ]
     } else if (dart_target_arch == "armv5te" ||
                dart_target_arch == "simarmv5te") {
       defines += [ "TARGET_ARCH_ARM" ]
       defines += [ "TARGET_ARCH_ARM_5TE" ]
     } else if (dart_target_arch == "arm64" || dart_target_arch == "simarm64") {
       defines += [ "TARGET_ARCH_ARM64" ]
     } else if (dart_target_arch == "mips" || dart_target_arch == "simmips") {
       defines += [ "TARGET_ARCH_MIPS" ]
     } else if (dart_target_arch == "x64") {
       defines += [ "TARGET_ARCH_X64" ]
     } else if (dart_target_arch == "ia32") {
       defines += [ "TARGET_ARCH_IA32" ]
     } else if (dart_target_arch == "dbc" || dart_target_arch == "simdbc" ||
                dart_target_arch == "simdbc64" ||
                dart_target_arch == "armsimdbc" ||
                dart_target_arch == "armsimdbc64") {
       defines += [ "TARGET_ARCH_DBC" ]
       defines += [ "USING_SIMULATOR" ]
     } else {
       print("Invalid dart_target_arch: $dart_target_arch")
       assert(false)
     }
   }
-}
-
-config("dart_config") {
-  defines = []
-
-  if (target_os == "android") {
-    defines += [ "TARGET_OS_ANDROID" ]
-  } else if (target_os == "fuchsia") {
-    defines += [ "TARGET_OS_FUCHSIA" ]
-  } else if (target_os == "ios") {
-    defines += [ "TARGET_OS_MACOS" ]
-    defines += [ "TARGET_OS_MACOS_IOS" ]
-  } else if (target_os == "linux") {
-    defines += [ "TARGET_OS_LINUX" ]
-  } else if (target_os == "mac") {
-    defines += [ "TARGET_OS_MACOS" ]
-  } else if (target_os == "win") {
-    defines += [ "TARGET_OS_WINDOWS" ]
-  } else {
-    print("Unknown target_os: $target_os")
-    assert(false)
-  }
 
   if (dart_debug) {
     defines += [ "DEBUG" ]
   } else {
     defines += [ "NDEBUG" ]
   }
 
   include_dirs = []
   if (dart_use_tcmalloc) {
     defines += [ "DART_USE_TCMALLOC" ]
@@ skipping 84 matching lines @@
       "vm/debugger_api_impl.cc",
       "vm/mirrors_api_impl.cc",
       "vm/native_api_impl.cc",
       "vm/version.h",
     ]
     defines = [ "DART_SHARED_LIB" ]
   }
 }
 
 libdart_library("libdart_jit") {
-  extra_configs = [ ":dart_use_target_arch_config" ]
   extra_deps = [
     "vm:libdart_lib_jit",
     "vm:libdart_vm_jit",
   ]
 }
 
 libdart_library("libdart_precompiled_runtime") {
-  extra_configs = [
-    ":dart_precompiled_runtime_config",
-    ":dart_use_target_arch_config",
-  ]
+  extra_configs = [ ":dart_precompiled_runtime_config" ]
   extra_deps = [
     "vm:libdart_lib_precompiled_runtime",
     "vm:libdart_vm_precompiled_runtime",
   ]
 }
 
 libdart_library("libdart_nosnapshot_with_precompiler") {
   extra_configs = [
     ":dart_no_snapshot_config",
     ":dart_precompiler_config",
-    ":dart_use_target_arch_config",
   ]
   extra_deps = [
     "vm:libdart_lib_nosnapshot_with_precompiler",
     "vm:libdart_vm_nosnapshot_with_precompiler",
   ]
 }
 
-# TODO(rmacnak): Remove if Fuchsia adds a checked-in SDK.
-libdart_library("libdart_nosnapshot_with_precompiler_host_arch") {
-  extra_configs = [
-    ":dart_no_snapshot_config",
-    ":dart_precompiler_config",
-  ]
-  extra_deps = [
-    "vm:libdart_lib_nosnapshot_with_precompiler_host_arch",
-    "vm:libdart_vm_nosnapshot_with_precompiler_host_arch",
-  ]
-}
-
 libdart_library("libdart_with_precompiler") {
-  extra_configs = [
-    ":dart_precompiler_config",
-    ":dart_use_target_arch_config",
-  ]
+  extra_configs = [ ":dart_precompiler_config" ]
   extra_deps = [
     "vm:libdart_lib_with_precompiler",
     "vm:libdart_vm_with_precompiler",
   ]
 }
 
 action("generate_version_cc_file") {
   deps = [
     ":libdart_dependency_helper",
   ]
@@ skipping 30 matching lines @@
     "third_party/double-conversion/src:libdouble_conversion",
     "vm:libdart_lib_jit",
     "vm:libdart_lib_nosnapshot_with_precompiler",
     "vm:libdart_vm_jit",
     "vm:libdart_vm_nosnapshot_with_precompiler",
   ]
   sources = [
     "vm/libdart_dependency_helper.cc",
   ]
 }