Skip to content

Commit ea228f2

Browse files
authored
Revert "Fix fml_unittests (flutter#14062)" (flutter#14087)
This reverts commit 6c605f8.
1 parent 84bf729 commit ea228f2

File tree

3 files changed

+30
-17
lines changed

3 files changed

+30
-17
lines changed

fml/BUILD.gn

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,6 @@ executable("fml_unittests") {
253253
"$flutter_root/runtime:libdart",
254254
"$flutter_root/testing",
255255
]
256-
257-
if (is_fuchsia && using_fuchsia_sdk) {
258-
libs = [ "${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/lib/libzircon.so" ]
259-
}
260256
}
261257

262258
if (is_fuchsia) {

runtime/BUILD.gn

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,17 @@ source_set("test_font") {
2828
group("libdart") {
2929
public_deps = []
3030

31-
if (flutter_runtime_mode == "profile" || flutter_runtime_mode == "release") {
32-
public_deps += [ "//third_party/dart/runtime:libdart_precompiled_runtime" ]
33-
} else {
34-
public_deps += [
35-
"$flutter_root/lib/snapshot",
36-
"//third_party/dart/runtime:libdart_jit",
37-
]
31+
if (!(is_fuchsia && using_fuchsia_sdk)) {
32+
if (flutter_runtime_mode == "profile" ||
33+
flutter_runtime_mode == "release") {
34+
public_deps +=
35+
[ "//third_party/dart/runtime:libdart_precompiled_runtime" ]
36+
} else {
37+
public_deps += [
38+
"$flutter_root/lib/snapshot",
39+
"//third_party/dart/runtime:libdart_jit",
40+
]
41+
}
3842
}
3943
}
4044

shell/platform/fuchsia/dart_runner/BUILD.gn

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ template("runner") {
1717

1818
invoker_output_name = invoker.output_name
1919
extra_defines = invoker.extra_defines
20-
extra_deps = []
21-
if (defined(invoker.extra_deps)) {
22-
extra_deps += invoker.extra_deps
23-
}
20+
extra_deps = invoker.extra_deps
2421

2522
executable(target_name) {
2623
output_name = invoker_output_name
@@ -80,12 +77,20 @@ runner("dart_jit_runner_bin") {
8077
if (flutter_runtime_mode == "profile") {
8178
extra_defines += [ "FLUTTER_PROFILE" ]
8279
}
80+
extra_deps = [
81+
"//third_party/dart/runtime:libdart_jit",
82+
"//third_party/dart/runtime/platform:libdart_platform_jit",
83+
]
8384
}
8485

8586
runner("dart_jit_product_runner_bin") {
8687
output_name = "dart_jit_product_runner"
8788
product = true
8889
extra_defines = [ "DART_PRODUCT" ]
90+
extra_deps = [
91+
"//third_party/dart/runtime:libdart_jit_product",
92+
"//third_party/dart/runtime/platform:libdart_platform_jit_product",
93+
]
8994
}
9095

9196
runner("dart_aot_runner_bin") {
@@ -95,7 +100,11 @@ runner("dart_aot_runner_bin") {
95100
if (flutter_runtime_mode == "profile") {
96101
extra_defines += [ "FLUTTER_PROFILE" ]
97102
}
98-
extra_deps = [ "embedder:dart_aot_snapshot_cc" ]
103+
extra_deps = [
104+
"embedder:dart_aot_snapshot_cc",
105+
"//third_party/dart/runtime:libdart_precompiled_runtime",
106+
"//third_party/dart/runtime/platform:libdart_platform_precompiled_runtime",
107+
]
99108
}
100109

101110
runner("dart_aot_product_runner_bin") {
@@ -105,7 +114,11 @@ runner("dart_aot_product_runner_bin") {
105114
"AOT_RUNTIME",
106115
"DART_PRODUCT",
107116
]
108-
extra_deps = [ "embedder:dart_aot_product_snapshot_cc" ]
117+
extra_deps = [
118+
"embedder:dart_aot_product_snapshot_cc",
119+
"//third_party/dart/runtime:libdart_precompiled_runtime_product",
120+
"//third_party/dart/runtime/platform:libdart_platform_precompiled_runtime_product",
121+
]
109122
}
110123

111124
template("aot_runner_package") {

0 commit comments

Comments
 (0)