Fuuuuuuuschiaaaaaaaaaaaa!!!!

Author: chinmaygarde

benchmarking/BUILD.gn

@@ -16,6 +16,7 @@ source_set("benchmarking") {
 
   public_deps = [
     "//flutter/fml",
+    "//flutter/runtime:libdart_flutter_policy",
     "//third_party/benchmark",
   ]
 

fml/BUILD.gn

@@ -191,6 +191,9 @@ source_set("fml") {
       "$fuchsia_sdk_root/pkg:trace-engine",
       "$fuchsia_sdk_root/pkg:zx",
     ]
+
+    libs +=
+        [ "${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/lib/libzircon.so" ]
   }
 
   if (is_win) {
@@ -282,10 +285,5 @@ if (enable_unittests) {
       "//flutter/fml/dart",
       "//flutter/testing",
     ]
-
-    if (is_fuchsia) {
-      libs =
-          [ "${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/lib/libzircon.so" ]
-    }
   }
 }

runtime/BUILD.gn

@@ -21,28 +21,43 @@ source_set("test_font") {
   }
 }
 
+is_profile_or_release =
+    flutter_runtime_mode == "profile" || flutter_runtime_mode == "release"
+
+# Fuchsia is special in that it does not use Flutter's policy of using JIT in
+# debug runtime mode and AOT in the profile and release modes. This is to
+# accommodate various runner configurations. :libdart allows for this by
+# not linking in a runtime and deferring that responsibility to the target.
+# However, all other non-runner target are now left with having to decide how to
+# link in a VM.
+group("libdart_flutter_policy") {
+  public_deps = []
+
+  # Flutter use AOT in profile or release and JIT in debug.
+  if (is_profile_or_release) {
+    public_deps += [ "//third_party/dart/runtime:libdart_precompiled_runtime" ]
+  } else {
+    public_deps += [ "//third_party/dart/runtime:libdart_jit" ]
+  }
+
+  # Instead of packaging the VM and isolate snapshots separately along with the
+  # AOT blob, JIT variants look for these assets in the binary itself.
+  if (!is_profile_or_release) {
+    public_deps += [ "//flutter/lib/snapshot" ]
+  }
+}
+
 # Picks the libdart implementation based on the Flutter runtime mode.
 group("libdart") {
   public_deps = []
 
-  is_profile_or_release =
-      flutter_runtime_mode == "profile" || flutter_runtime_mode == "release"
-
   # Whether Fuchsia uses JIT or AOT does not depend on the runtime mode. Instead
   # multiple runner variants are built and those runners explicitly link in the
   # right variant of the VM.
   if (!is_fuchsia) {
-    # Flutter use AOT in profile or release and JIT in debug.
-    if (is_profile_or_release) {
-      public_deps +=
-          [ "//third_party/dart/runtime:libdart_precompiled_runtime" ]
-    } else {
-      public_deps += [ "//third_party/dart/runtime:libdart_jit" ]
-    }
+    public_deps += [ ":libdart_flutter_policy" ]
   }
 
-  # Instead of packaging the VM and isolate snapshots separately along with the
-  # AOT blob, JIT variants look for these assets in the binary itself.
   if (!is_profile_or_release) {
     public_deps += [ "//flutter/lib/snapshot" ]
   }

testing/BUILD.gn

@@ -37,7 +37,10 @@ source_set("testing") {
     "test_timeout_listener.h",
   ]
 
-  public_deps = [ ":testing_lib" ]
+  public_deps = [
+    ":testing_lib",
+    "//flutter/runtime:libdart_flutter_policy",
+  ]
 }
 
 source_set("dart") {