diff --git a/fml/BUILD.gn b/fml/BUILD.gn index 68b9725fa6b2e..408942435ab83 100644 --- a/fml/BUILD.gn +++ b/fml/BUILD.gn @@ -253,6 +253,10 @@ executable("fml_unittests") { "$flutter_root/runtime:libdart", "$flutter_root/testing", ] + + if (is_fuchsia && using_fuchsia_sdk) { + libs = [ "${fuchsia_sdk_path}/arch/${target_cpu}/sysroot/lib/libzircon.so" ] + } } if (is_fuchsia) { diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn index 5e41f19f031e2..ff2510513fc76 100644 --- a/runtime/BUILD.gn +++ b/runtime/BUILD.gn @@ -28,17 +28,13 @@ source_set("test_font") { group("libdart") { public_deps = [] - if (!(is_fuchsia && using_fuchsia_sdk)) { - if (flutter_runtime_mode == "profile" || - flutter_runtime_mode == "release") { - public_deps += - [ "//third_party/dart/runtime:libdart_precompiled_runtime" ] - } else { - public_deps += [ - "$flutter_root/lib/snapshot", - "//third_party/dart/runtime:libdart_jit", - ] - } + if (flutter_runtime_mode == "profile" || flutter_runtime_mode == "release") { + public_deps += [ "//third_party/dart/runtime:libdart_precompiled_runtime" ] + } else { + public_deps += [ + "$flutter_root/lib/snapshot", + "//third_party/dart/runtime:libdart_jit", + ] } } diff --git a/shell/platform/fuchsia/dart_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/BUILD.gn index 735a5dbfab716..ce7de986e450e 100644 --- a/shell/platform/fuchsia/dart_runner/BUILD.gn +++ b/shell/platform/fuchsia/dart_runner/BUILD.gn @@ -17,7 +17,10 @@ template("runner") { invoker_output_name = invoker.output_name extra_defines = invoker.extra_defines - extra_deps = invoker.extra_deps + extra_deps = [] + if (defined(invoker.extra_deps)) { + extra_deps += invoker.extra_deps + } executable(target_name) { output_name = invoker_output_name @@ -77,20 +80,12 @@ runner("dart_jit_runner_bin") { if (flutter_runtime_mode == "profile") { extra_defines += [ "FLUTTER_PROFILE" ] } - extra_deps = [ - "//third_party/dart/runtime:libdart_jit", - "//third_party/dart/runtime/platform:libdart_platform_jit", - ] } runner("dart_jit_product_runner_bin") { output_name = "dart_jit_product_runner" product = true extra_defines = [ "DART_PRODUCT" ] - extra_deps = [ - "//third_party/dart/runtime:libdart_jit_product", - "//third_party/dart/runtime/platform:libdart_platform_jit_product", - ] } runner("dart_aot_runner_bin") { @@ -100,11 +95,7 @@ runner("dart_aot_runner_bin") { if (flutter_runtime_mode == "profile") { extra_defines += [ "FLUTTER_PROFILE" ] } - extra_deps = [ - "embedder:dart_aot_snapshot_cc", - "//third_party/dart/runtime:libdart_precompiled_runtime", - "//third_party/dart/runtime/platform:libdart_platform_precompiled_runtime", - ] + extra_deps = [ "embedder:dart_aot_snapshot_cc" ] } runner("dart_aot_product_runner_bin") { @@ -114,11 +105,7 @@ runner("dart_aot_product_runner_bin") { "AOT_RUNTIME", "DART_PRODUCT", ] - extra_deps = [ - "embedder:dart_aot_product_snapshot_cc", - "//third_party/dart/runtime:libdart_precompiled_runtime_product", - "//third_party/dart/runtime/platform:libdart_platform_precompiled_runtime_product", - ] + extra_deps = [ "embedder:dart_aot_product_snapshot_cc" ] } template("aot_runner_package") {