DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix fml_unittests (#14062)" (#14087)

Browse Source 
This reverts commit 6c605f8a9624a99573c6801395f03bff7ee8cc4c.
This commit is contained in:
Kaushik Iska 2019-12-03 12:24:19 -08:00 committed by GitHub
parent 84bf72917c
commit ea228f2f83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fml/BUILD.gn
View File

@ -253,10 +253,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) {

18
runtime/BUILD.gn
View File

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

25
shell/platform/fuchsia/dart_runner/BUILD.gn
View File

@ -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
@ -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") {
@ -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") {
@ -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") {