Only depend on FML for tracing when building executables. (flutter#72)

Otherwise, depending on Impeller will cause an explicit dependency on whatever VM variant :libdart picks. And, some other unit-test in the engine explicitly link in the JIT variant which leads to duplicate symbol errors in profile and release modes.
egramond · Apr 27, 2022 · e46345d · e46345d
1 parent 597c10e
commit e46345d
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 45 deletions.
diff --git a/impeller/BUILD.gn b/impeller/BUILD.gn
@@ -37,5 +37,9 @@ executable("impeller_unittests") {
     "playground",
     "renderer:renderer_unittests",
     "typographer:typographer_unittests",
+
+    # FML depends on the Dart VM for tracing and getting the current
+    # timepoint.
+    "//flutter/runtime:libdart",
   ]
 }
diff --git a/impeller/aiks/BUILD.gn b/impeller/aiks/BUILD.gn
@@ -28,13 +28,7 @@ impeller_component("aiks") {
     "../geometry",
   ]
 
-  deps = [
-    "//flutter/fml",
-
-    # FML depends on the Dart VM for tracing and getting the current
-    # timepoint.
-    "//flutter/runtime:libdart",
-  ]
+  deps = [ "//flutter/fml" ]
 }
 
 impeller_component("aiks_unittests") {

diff --git a/impeller/archivist/BUILD.gn b/impeller/archivist/BUILD.gn
@@ -33,10 +33,6 @@ impeller_component("archivist") {
 
   deps = [
     "//flutter/fml",
-
-    # FML depends on the Dart VM for tracing and getting the current
-    # timepoint.
-    "//flutter/runtime:libdart",
     "//third_party/sqlite",
   ]
 }

diff --git a/impeller/base/BUILD.gn b/impeller/base/BUILD.gn
@@ -21,13 +21,7 @@ impeller_component("base") {
     "validation.h",
   ]
 
-  deps = [
-    "//flutter/fml",
-
-    # FML depends on the Dart VM for tracing and getting the current
-    # timepoint.
-    "//flutter/runtime:libdart",
-  ]
+  deps = [ "//flutter/fml" ]
 }
 
 impeller_component("base_unittests") {

diff --git a/impeller/compiler/BUILD.gn b/impeller/compiler/BUILD.gn
@@ -23,7 +23,6 @@ impeller_component("compiler_lib") {
     "../base",
     "../geometry",
     "//flutter/fml",
-    "//flutter/runtime:libdart",
     "//third_party/inja",
     "//third_party/shaderc_flutter",
     "//third_party/spirv_cross_flutter",
@@ -35,7 +34,13 @@ impeller_component("impellerc") {
 
   sources = [ "impellerc_main.cc" ]
 
-  deps = [ ":compiler_lib" ]
+  deps = [
+    ":compiler_lib",
+
+    # FML depends on the Dart VM for tracing and getting the current
+    # timepoint.
+    "//flutter/runtime:libdart",
+  ]
 }
 
 group("compiler") {

diff --git a/impeller/entity/BUILD.gn b/impeller/entity/BUILD.gn
@@ -57,13 +57,7 @@ impeller_component("entity") {
     "../typographer",
   ]
 
-  deps = [
-    "//flutter/fml",
-
-    # FML depends on the Dart VM for tracing and getting the current
-    # timepoint.
-    "//flutter/runtime:libdart",
-  ]
+  deps = [ "//flutter/fml" ]
 }
 
 impeller_component("entity_unittests") {

diff --git a/impeller/image/BUILD.gn b/impeller/image/BUILD.gn
@@ -24,10 +24,6 @@ impeller_component("image") {
 
   deps = [
     "//flutter/fml",
-
-    # FML depends on the Dart VM for tracing and getting the current
-    # timepoint.
-    "//flutter/runtime:libdart",
     "//third_party/skia",
   ]
 }

diff --git a/impeller/renderer/BUILD.gn b/impeller/renderer/BUILD.gn
@@ -108,13 +108,7 @@ impeller_component("renderer") {
     "../tessellator",
   ]
 
-  deps = [
-    "//flutter/fml",
-
-    # FML depends on the Dart VM for tracing and getting the current
-    # timepoint.
-    "//flutter/runtime:libdart",
-  ]
+  deps = [ "//flutter/fml" ]
 
   frameworks = [ "Metal.framework" ]
 }

diff --git a/impeller/typographer/BUILD.gn b/impeller/typographer/BUILD.gn
@@ -37,13 +37,7 @@ impeller_component("typographer") {
     "//third_party/skia",
   ]
 
-  deps = [
-    "//flutter/fml",
-
-    # FML depends on the Dart VM for tracing and getting the current
-    # timepoint.
-    "//flutter/runtime:libdart",
-  ]
+  deps = [ "//flutter/fml" ]
 }
 
 impeller_component("typographer_unittests") {