Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Revert "Fix fml_unittests (#14062)" #14087

Merged
merged 1 commit into from
Dec 3, 2019
Merged

Revert "Fix fml_unittests (#14062)" #14087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions fml/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,6 @@ 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) {
Expand Down
18 changes: 11 additions & 7 deletions runtime/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,17 @@ source_set("test_font") {
group("libdart") {
public_deps = []

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 (!(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",
]
}
}
}

Expand Down
25 changes: 19 additions & 6 deletions shell/platform/fuchsia/dart_runner/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ template("runner") {

invoker_output_name = invoker.output_name
extra_defines = invoker.extra_defines
extra_deps = []
if (defined(invoker.extra_deps)) {
extra_deps += invoker.extra_deps
}
extra_deps = invoker.extra_deps

executable(target_name) {
output_name = invoker_output_name
Expand Down Expand Up @@ -80,12 +77,20 @@ 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") {
Expand All @@ -95,7 +100,11 @@ runner("dart_aot_runner_bin") {
if (flutter_runtime_mode == "profile") {
extra_defines += [ "FLUTTER_PROFILE" ]
}
extra_deps = [ "embedder:dart_aot_snapshot_cc" ]
extra_deps = [
"embedder:dart_aot_snapshot_cc",
"//third_party/dart/runtime:libdart_precompiled_runtime",
"//third_party/dart/runtime/platform:libdart_platform_precompiled_runtime",
]
}

runner("dart_aot_product_runner_bin") {
Expand All @@ -105,7 +114,11 @@ runner("dart_aot_product_runner_bin") {
"AOT_RUNTIME",
"DART_PRODUCT",
]
extra_deps = [ "embedder:dart_aot_product_snapshot_cc" ]
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",
]
}

template("aot_runner_package") {
Expand Down