Skip to content

Commit 6c605f8

Browse files
authored
Fix fml_unittests (flutter#14062)
1 parent 0fc7867 commit 6c605f8

File tree

3 files changed

+17
-30
lines changed

3 files changed

+17
-30
lines changed

fml/BUILD.gn

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,10 @@ 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+
}
256260
}
257261

258262
if (is_fuchsia) {

runtime/BUILD.gn

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

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-
}
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+
]
4238
}
4339
}
4440

shell/platform/fuchsia/dart_runner/BUILD.gn

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

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

2225
executable(target_name) {
2326
output_name = invoker_output_name
@@ -77,20 +80,12 @@ runner("dart_jit_runner_bin") {
7780
if (flutter_runtime_mode == "profile") {
7881
extra_defines += [ "FLUTTER_PROFILE" ]
7982
}
80-
extra_deps = [
81-
"//third_party/dart/runtime:libdart_jit",
82-
"//third_party/dart/runtime/platform:libdart_platform_jit",
83-
]
8483
}
8584

8685
runner("dart_jit_product_runner_bin") {
8786
output_name = "dart_jit_product_runner"
8887
product = true
8988
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-
]
9489
}
9590

9691
runner("dart_aot_runner_bin") {
@@ -100,11 +95,7 @@ runner("dart_aot_runner_bin") {
10095
if (flutter_runtime_mode == "profile") {
10196
extra_defines += [ "FLUTTER_PROFILE" ]
10297
}
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-
]
98+
extra_deps = [ "embedder:dart_aot_snapshot_cc" ]
10899
}
109100

110101
runner("dart_aot_product_runner_bin") {
@@ -114,11 +105,7 @@ runner("dart_aot_product_runner_bin") {
114105
"AOT_RUNTIME",
115106
"DART_PRODUCT",
116107
]
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-
]
108+
extra_deps = [ "embedder:dart_aot_product_snapshot_cc" ]
122109
}
123110

124111
template("aot_runner_package") {

0 commit comments

Comments
 (0)