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

chinmaygarde · dnfield · commit e46345db6d15 · 2022-04-27T15:57:33.000-07:00
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.
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") {

Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,9 @@ executable("impeller_unittests") {`
`37`	`37`	`"playground",`
`38`	`38`	`"renderer:renderer_unittests",`
`39`	`39`	`"typographer:typographer_unittests",`
	`40`	`+`
	`41`	`+ # FML depends on the Dart VM for tracing and getting the current`
	`42`	`+ # timepoint.`
	`43`	`+ "//flutter/runtime:libdart",`
`40`	`44`	`]`
`41`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,13 +28,7 @@ impeller_component("aiks") {`
`28`	`28`	`"../geometry",`
`29`	`29`	`]`
`30`	`30`
`31`		`- deps = [`
`32`		`- "//flutter/fml",`
`33`		`-`
`34`		`- # FML depends on the Dart VM for tracing and getting the current`
`35`		`- # timepoint.`
`36`		`- "//flutter/runtime:libdart",`
`37`		`- ]`
	`31`	`+ deps = [ "//flutter/fml" ]`
`38`	`32`	`}`
`39`	`33`
`40`	`34`	`impeller_component("aiks_unittests") {`
Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,6 @@ impeller_component("archivist") {`
`33`	`33`
`34`	`34`	`deps = [`
`35`	`35`	`"//flutter/fml",`
`36`		`-`
`37`		`- # FML depends on the Dart VM for tracing and getting the current`
`38`		`- # timepoint.`
`39`		`- "//flutter/runtime:libdart",`
`40`	`36`	`"//third_party/sqlite",`
`41`	`37`	`]`
`42`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,7 @@ impeller_component("base") {`
`21`	`21`	`"validation.h",`
`22`	`22`	`]`
`23`	`23`
`24`		`- deps = [`
`25`		`- "//flutter/fml",`
`26`		`-`
`27`		`- # FML depends on the Dart VM for tracing and getting the current`
`28`		`- # timepoint.`
`29`		`- "//flutter/runtime:libdart",`
`30`		`- ]`
	`24`	`+ deps = [ "//flutter/fml" ]`
`31`	`25`	`}`
`32`	`26`
`33`	`27`	`impeller_component("base_unittests") {`
Original file line number	Diff line number	Diff line change
`@@ -57,13 +57,7 @@ impeller_component("entity") {`
`57`	`57`	`"../typographer",`
`58`	`58`	`]`
`59`	`59`
`60`		`- deps = [`
`61`		`- "//flutter/fml",`
`62`		`-`
`63`		`- # FML depends on the Dart VM for tracing and getting the current`
`64`		`- # timepoint.`
`65`		`- "//flutter/runtime:libdart",`
`66`		`- ]`
	`60`	`+ deps = [ "//flutter/fml" ]`
`67`	`61`	`}`
`68`	`62`
`69`	`63`	`impeller_component("entity_unittests") {`
Original file line number	Diff line number	Diff line change
`@@ -24,10 +24,6 @@ impeller_component("image") {`
`24`	`24`
`25`	`25`	`deps = [`
`26`	`26`	`"//flutter/fml",`
`27`		`-`
`28`		`- # FML depends on the Dart VM for tracing and getting the current`
`29`		`- # timepoint.`
`30`		`- "//flutter/runtime:libdart",`
`31`	`27`	`"//third_party/skia",`
`32`	`28`	`]`
`33`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,13 +108,7 @@ impeller_component("renderer") {`
`108`	`108`	`"../tessellator",`
`109`	`109`	`]`
`110`	`110`
`111`		`- deps = [`
`112`		`- "//flutter/fml",`
`113`		`-`
`114`		`- # FML depends on the Dart VM for tracing and getting the current`
`115`		`- # timepoint.`
`116`		`- "//flutter/runtime:libdart",`
`117`		`- ]`
	`111`	`+ deps = [ "//flutter/fml" ]`
`118`	`112`
`119`	`113`	`frameworks = [ "Metal.framework" ]`
`120`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,7 @@ impeller_component("typographer") {`
`37`	`37`	`"//third_party/skia",`
`38`	`38`	`]`
`39`	`39`
`40`		`- deps = [`
`41`		`- "//flutter/fml",`
`42`		`-`
`43`		`- # FML depends on the Dart VM for tracing and getting the current`
`44`		`- # timepoint.`
`45`		`- "//flutter/runtime:libdart",`
`46`		`- ]`
	`40`	`+ deps = [ "//flutter/fml" ]`
`47`	`41`	`}`
`48`	`42`
`49`	`43`	`impeller_component("typographer_unittests") {`