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

runtime/BUILD.gn

Index: runtime/BUILD.gn
diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn
index 1bac55a1ae1dd17f645fd86c2a44ef6a45f1ac39..2d4e7dda0765e8c0004a222477bbb2775597d395 100644
--- a/runtime/BUILD.gn
+++ b/runtime/BUILD.gn
@@ -72,11 +72,27 @@ config("dart_no_snapshot_config") {
   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" ]
@@ -106,28 +122,6 @@ config("dart_use_target_arch_config") {
       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" ]
@@ -232,7 +226,6 @@ template("libdart_library") {
 }
 
 libdart_library("libdart_jit") {
-  extra_configs = [ ":dart_use_target_arch_config" ]
   extra_deps = [
     "vm:libdart_lib_jit",
     "vm:libdart_vm_jit",
@@ -240,10 +233,7 @@ libdart_library("libdart_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",
@@ -254,7 +244,6 @@ 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",
@@ -262,23 +251,8 @@ libdart_library("libdart_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",