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

fuchsia: Enable ASAN; add tests flag (flutter/engine#29414)

Browse Source 
* Get ASAN working

* Remove zircon_ffi from build

* Add enable-unittests gn flag
This commit is contained in:
David Worsham 2021-10-29 15:10:29 -07:00 committed by GitHub
parent 7acd2202e5
commit 4c9cf9869a
7 changed files with 421 additions and 410 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/flutter/BUILD.gn
View File

@ -227,7 +227,7 @@ group("dist") {
deps = [ "//flutter/sky/dist" ]
}
if (is_fuchsia) {
if (is_fuchsia && enable_unittests) {
group("fuchsia_tests") {
testonly = true

9
engine/src/flutter/shell/platform/fuchsia/BUILD.gn
View File

@ -6,6 +6,7 @@ assert(is_fuchsia)
import("//build/fuchsia/sdk.gni")
import("//flutter/common/config.gni")
import("//flutter/testing/testing.gni")
import("//flutter/tools/fuchsia/dart.gni")
import("//flutter/tools/fuchsia/fuchsia_host_bundle.gni")
@ -84,8 +85,10 @@ group("fuchsia") {
]
}
group("tests") {
testonly = true
if (enable_unittests) {
group("tests") {
testonly = true
deps = [ "flutter:tests" ]
deps = [ "flutter:tests" ]
}
}

10
engine/src/flutter/shell/platform/fuchsia/dart-pkg/zircon/BUILD.gn
View File

@ -3,6 +3,7 @@
# found in the LICENSE file.
import("//build/fuchsia/sdk.gni")
import("//flutter/testing/testing.gni")
config("zircon_config") {
include_dirs = [ "." ]
@ -30,13 +31,14 @@ source_set("zircon") {
"$fuchsia_sdk_root/pkg:async-loop-cpp",
"$fuchsia_sdk_root/pkg:fdio",
"$fuchsia_sdk_root/pkg:zx",
"../zircon_ffi",
"//flutter/fml",
"//flutter/third_party/tonic",
]
}
source_set("test") {
testonly = true
deps = [ "test" ]
if (enable_unittests) {
source_set("test") {
testonly = true
deps = [ "test" ]
}
}

15
engine/src/flutter/shell/platform/fuchsia/dart_runner/BUILD.gn
View File

@ -10,14 +10,6 @@ import("//flutter/tools/fuchsia/dart.gni")
import("//flutter/tools/fuchsia/fuchsia_archive.gni")
import("//flutter/tools/fuchsia/fuchsia_libs.gni")
# Loaded via FFI
_common_runner_libs = common_libs + [
{
name = "libzircon_ffi.so"
path = rebase_path("$root_out_dir")
},
]
template("runner") {
assert(defined(invoker.product), "The parameter 'product' must be defined")
assert(defined(invoker.output_name),
@ -50,9 +42,6 @@ template("runner") {
defines = extra_defines
# For `libzircon_ffi` see _common_runner_libs.
public_deps = [ "../dart-pkg/zircon_ffi:zircon_ffi" ]
dart_deps = []
if (!invoker.product) {
dart_deps += [
@ -165,7 +154,7 @@ template("aot_runner_package") {
cmx_file = rebase_path("meta/dart_aot${product_suffix}_runner.cmx")
cml_file = rebase_path("meta/dart_aot${product_suffix}_runner.cml")
libraries = _common_runner_libs
libraries = common_libs
resources = []
if (!invoker.product) {
@ -226,7 +215,7 @@ template("jit_runner_package") {
cmx_file = rebase_path("meta/dart_jit${product_suffix}_runner.cmx")
cml_file = rebase_path("meta/dart_jit${product_suffix}_runner.cml")
libraries = _common_runner_libs
libraries = common_libs
resources = [
{

747
engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn
View File

@ -178,14 +178,6 @@ runner_sources("flutter_runner_sources_product") {
product = true
}
# Loaded via FFI
_common_runner_libs = common_libs + [
{
name = "libzircon_ffi.so"
path = rebase_path("$root_out_dir")
},
]
# Things that explicitly being excluded:
# 1. Kernel snapshot framework mode.
# 2. Profiler symbols.
@ -230,9 +222,6 @@ template("flutter_runner") {
"$fuchsia_sdk_root/pkg:trace-provider-so",
] + extra_deps
# For `libzircon_ffi` see _common_runner_libs.
public_deps = [ "../dart-pkg/zircon_ffi:zircon_ffi" ]
# The flags below are needed so that Dart's CPU profiler can walk the
# C++ stack.
cflags = [ "-fno-omit-frame-pointer" ]
@ -370,7 +359,7 @@ template("jit_runner") {
]
_vulkan_icds = []
_libs = _common_runner_libs
_libs = common_libs
if (enable_vulkan_validation_layers) {
_libs += vulkan_validation_libs
_vulkan_icds += vulkan_icds
@ -429,7 +418,7 @@ template("aot_runner") {
}
_vulkan_icds = []
_libs = _common_runner_libs
_libs = common_libs
if (enable_vulkan_validation_layers) {
_libs += vulkan_validation_libs
_vulkan_icds += vulkan_icds
@ -461,376 +450,374 @@ test_fixtures("flutter_runner_fixtures") {
fixtures = []
}
executable("flutter_runner_unittests") {
testonly = true
if (enable_unittests) {
executable("flutter_runner_unittests") {
testonly = true
output_name = "flutter_runner_tests"
output_name = "flutter_runner_tests"
sources = [
"accessibility_bridge_unittest.cc",
"component_v1_unittest.cc",
"flutter_runner_fakes.h",
"focus_delegate_unittests.cc",
"fuchsia_intl_unittest.cc",
"keyboard_unittest.cc",
"platform_view_unittest.cc",
"pointer_delegate_unittests.cc",
"runner_unittest.cc",
"tests/engine_unittests.cc",
"tests/fake_flatland_unittests.cc",
"tests/fake_session_unittests.cc",
"tests/flatland_connection_unittests.cc",
"tests/flatland_external_view_embedder_unittests.cc",
"tests/flutter_runner_product_configuration_unittests.cc",
"tests/gfx_external_view_embedder_unittests.cc",
"tests/gfx_session_connection_unittests.cc",
"tests/pointer_event_utility.cc",
"tests/pointer_event_utility.h",
"vsync_waiter_unittest.cc",
]
sources = [
"accessibility_bridge_unittest.cc",
"component_v1_unittest.cc",
"flutter_runner_fakes.h",
"focus_delegate_unittests.cc",
"fuchsia_intl_unittest.cc",
"keyboard_unittest.cc",
"platform_view_unittest.cc",
"pointer_delegate_unittests.cc",
"runner_unittest.cc",
"tests/engine_unittests.cc",
"tests/fake_flatland_unittests.cc",
"tests/fake_session_unittests.cc",
"tests/flatland_connection_unittests.cc",
"tests/flatland_external_view_embedder_unittests.cc",
"tests/flutter_runner_product_configuration_unittests.cc",
"tests/gfx_external_view_embedder_unittests.cc",
"tests/gfx_session_connection_unittests.cc",
"tests/pointer_event_utility.cc",
"tests/pointer_event_utility.h",
"vsync_waiter_unittest.cc",
]
# This is needed for //third_party/googletest for linking zircon symbols.
libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ]
# This is needed for //third_party/googletest for linking zircon symbols.
libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ]
# The use of these dependencies is temporary and will be moved behind the
# embedder API.
flutter_deps = [
"//flutter/assets:assets",
"//flutter/common/graphics",
"//flutter/flow",
"//flutter/lib/ui",
"//flutter/shell/common",
"//third_party/dart/runtime:libdart_jit",
"//third_party/dart/runtime/platform:libdart_platform_jit",
]
# The use of these dependencies is temporary and will be moved behind the
# embedder API.
flutter_deps = [
"//flutter/assets:assets",
"//flutter/common/graphics",
"//flutter/flow",
"//flutter/lib/ui",
"//flutter/shell/common",
"//third_party/dart/runtime:libdart_jit",
"//third_party/dart/runtime/platform:libdart_platform_jit",
]
deps = [
"tests/fakes",
":flutter_runner_fixtures",
":flutter_runner_sources",
"//build/fuchsia/pkg:async-testing",
"//build/fuchsia/pkg:sys_cpp_testing",
"//flutter/testing",
] + flutter_deps
}
executable("flutter_runner_tzdata_unittests") {
testonly = true
output_name = "flutter_runner_tzdata_tests"
sources = [ "runner_tzdata_unittest.cc" ]
# This is needed for //third_party/googletest for linking zircon symbols.
libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ]
# The use of these dependencies is temporary and will be moved behind the
# embedder API.
flutter_deps = [
"//flutter/lib/ui",
"//third_party/dart/runtime:libdart_jit",
"//third_party/dart/runtime/platform:libdart_platform_jit",
]
deps = [
":flutter_runner_fixtures",
":flutter_runner_sources",
"//flutter/testing",
] + flutter_deps
}
fuchsia_test_archive("flutter_runner_tests") {
deps = [ ":flutter_runner_unittests" ]
binary = "$target_name"
resources = [
{
path = rebase_path("//third_party/icu/common/icudtl.dat")
dest = "icudtl.dat"
},
{
path = rebase_path(
"//flutter/shell/platform/fuchsia/flutter/tests/tzdata/2019a/44/le/metaZones.res")
dest = "tzdata/metaZones.res"
},
{
path = rebase_path(
"//flutter/shell/platform/fuchsia/flutter/tests/tzdata/2019a/44/le/timezoneTypes.res")
dest = "tzdata/timezoneTypes.res"
},
{
path = rebase_path(
"//flutter/shell/platform/fuchsia/flutter/tests/tzdata/2019a/44/le/zoneinfo64.res")
dest = "tzdata/zoneinfo64.res"
},
]
cmx_file = rebase_path("meta/$target_name.cmx")
}
fuchsia_test_archive("flutter_runner_tzdata_tests") {
deps = [ ":flutter_runner_tzdata_unittests" ]
binary = "$target_name"
resources = [
{
path = rebase_path("//third_party/icu/common/icudtl.dat")
dest = "icudtl.dat"
},
]
}
fuchsia_test_archive("fml_tests") {
deps = [ "//flutter/fml:fml_unittests" ]
binary = "fml_unittests"
}
fuchsia_test_archive("flow_tests") {
deps = [ "//flutter/flow:flow_unittests" ]
binary = "flow_unittests"
resources = [
{
path = rebase_path(
"//flutter/testing/resources/performance_overlay_gold_60fps.png")
dest = "flutter/testing/resources/performance_overlay_gold_60fps.png"
},
{
path = rebase_path(
"//flutter/testing/resources/performance_overlay_gold_90fps.png")
dest = "flutter/testing/resources/performance_overlay_gold_90fps.png"
},
{
path = rebase_path(
"//flutter/testing/resources/performance_overlay_gold_120fps.png")
dest = "flutter/testing/resources/performance_overlay_gold_120fps.png"
},
]
}
fuchsia_test_archive("runtime_tests") {
deps = [
"//flutter/runtime:runtime_fixtures",
"//flutter/runtime:runtime_unittests",
]
binary = "runtime_unittests"
# TODO(gw280): https://github.com/flutter/flutter/issues/50294
# Right now we need to manually specify all the fixtures that are
# declared in the test_fixtures() call above.
resources = [
{
path = "$root_gen_dir/flutter/runtime/assets/kernel_blob.bin"
dest = "assets/kernel_blob.bin"
},
]
}
fuchsia_test_archive("shell_tests") {
deps = [
"//flutter/shell/common:shell_unittests",
"//flutter/shell/common:shell_unittests_fixtures",
]
binary = "shell_unittests"
# TODO(gw280): https://github.com/flutter/flutter/issues/50294
# Right now we need to manually specify all the fixtures that are
# declared in the test_fixtures() call above.
resources = [
{
path = "$root_gen_dir/flutter/shell/common/assets/kernel_blob.bin"
dest = "assets/kernel_blob.bin"
},
{
path =
"$root_gen_dir/flutter/shell/common/assets/shelltest_screenshot.png"
dest = "assets/shelltest_screenshot.png"
},
]
libraries = vulkan_validation_libs
resources += vulkan_icds
}
fuchsia_test_archive("testing_tests") {
deps = [ "//flutter/testing:testing_unittests" ]
binary = "testing_unittests"
}
fuchsia_test_archive("txt_tests") {
deps = [ "//flutter/third_party/txt:txt_unittests" ]
binary = "txt_unittests"
resources = [
{
path = rebase_path("//third_party/icu/common/icudtl.dat")
dest = "icudtl.dat"
},
{
path = rebase_path("//third_party/icu/common/icudtl.dat")
dest = "icudtl2.dat"
},
]
}
fuchsia_test_archive("ui_tests") {
deps = [
"//flutter/lib/ui:ui_unittests",
"//flutter/lib/ui:ui_unittests_fixtures",
]
binary = "ui_unittests"
# TODO(gw280): https://github.com/flutter/flutter/issues/50294
# Right now we need to manually specify all the fixtures that are
# declared in the test_fixtures() call above.
resources = [
{
path = "$root_gen_dir/flutter/lib/ui/assets/kernel_blob.bin"
dest = "assets/kernel_blob.bin"
},
{
path = "$root_gen_dir/flutter/lib/ui/assets/DashInNooglerHat.jpg"
dest = "assets/DashInNooglerHat.jpg"
},
{
path = "$root_gen_dir/flutter/lib/ui/assets/Horizontal.jpg"
dest = "assets/Horizontal.jpg"
},
{
path = "$root_gen_dir/flutter/lib/ui/assets/Horizontal.png"
dest = "assets/Horizontal.png"
},
{
path = "$root_gen_dir/flutter/lib/ui/assets/hello_loop_2.gif"
dest = "assets/hello_loop_2.gif"
},
{
path = "$root_gen_dir/flutter/lib/ui/assets/hello_loop_2.webp"
dest = "assets/hello_loop_2.webp"
},
]
libraries = vulkan_validation_libs
resources += vulkan_icds
}
fuchsia_test_archive("embedder_tests") {
deps = [
"//flutter/shell/platform/embedder:embedder_unittests",
"//flutter/shell/platform/embedder:fixtures",
]
binary = "embedder_unittests"
# TODO(gw280): https://github.com/flutter/flutter/issues/50294
# Right now we need to manually specify all the fixtures that are
# declared in the test_fixtures() call above.
resources = [
{
path =
"$root_gen_dir/flutter/shell/platform/embedder/assets/kernel_blob.bin"
dest = "assets/kernel_blob.bin"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/arc_end_caps.png"
dest = "assets/arc_end_caps.png"
},
{
path =
"$root_gen_dir/flutter/shell/platform/embedder/assets/compositor.png"
dest = "assets/compositor.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/compositor_root_surface_xformation.png"
dest = "assets/compositor_root_surface_xformation.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/compositor_software.png"
dest = "assets/compositor_software.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/compositor_with_platform_layer_on_bottom.png"
dest = "assets/compositor_with_platform_layer_on_bottom.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/compositor_with_root_layer_only.png"
dest = "assets/compositor_with_root_layer_only.png"
},
{
path =
"$root_gen_dir/flutter/shell/platform/embedder/assets/dpr_noxform.png"
dest = "assets/dpr_noxform.png"
},
{
path =
"$root_gen_dir/flutter/shell/platform/embedder/assets/dpr_xform.png"
dest = "assets/dpr_xform.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/gradient.png"
dest = "assets/gradient.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/gradient_xform.png"
dest = "assets/gradient_xform.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/scene_without_custom_compositor.png"
dest = "assets/scene_without_custom_compositor.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/scene_without_custom_compositor_with_xform.png"
dest = "assets/scene_without_custom_compositor_with_xform.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/snapshot_large_scene.png"
dest = "assets/snapshot_large_scene.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/verifyb143464703.png"
dest = "assets/verifyb143464703.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/verifyb143464703_soft_noxform.png"
dest = "assets/verifyb143464703_soft_noxform.png"
},
]
}
fuchsia_test_archive("dart_utils_tests") {
deps = [
"//flutter/shell/platform/fuchsia/runtime/dart/utils:dart_utils_unittests",
]
binary = "dart_utils_unittests"
}
# When adding a new dep here, please also ensure the dep is added to
# testing/fuchsia/run_tests.sh and testing/fuchsia/test_fars
group("tests") {
testonly = true
deps = [
":dart_utils_tests",
":embedder_tests",
":flow_tests",
":flutter_runner_tests",
":flutter_runner_tzdata_tests",
":fml_tests",
":runtime_tests",
":shell_tests",
":testing_tests",
":txt_tests",
":ui_tests",
"integration_flutter_tests",
]
deps = [
"tests/fakes",
":flutter_runner_fixtures",
":flutter_runner_sources",
"//build/fuchsia/pkg:async-testing",
"//build/fuchsia/pkg:sys_cpp_testing",
"//flutter/testing",
] + flutter_deps
}
executable("flutter_runner_tzdata_unittests") {
testonly = true
output_name = "flutter_runner_tzdata_tests"
sources = [ "runner_tzdata_unittest.cc" ]
# This is needed for //third_party/googletest for linking zircon symbols.
libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ]
# The use of these dependencies is temporary and will be moved behind the
# embedder API.
flutter_deps = [
"//flutter/lib/ui",
"//third_party/dart/runtime:libdart_jit",
"//third_party/dart/runtime/platform:libdart_platform_jit",
]
deps = [
":flutter_runner_fixtures",
":flutter_runner_sources",
"//flutter/testing",
] + flutter_deps
}
fuchsia_test_archive("flutter_runner_tests") {
deps = [ ":flutter_runner_unittests" ]
binary = "$target_name"
resources = [
{
path = rebase_path("//third_party/icu/common/icudtl.dat")
dest = "icudtl.dat"
},
{
path = rebase_path(
"//flutter/shell/platform/fuchsia/flutter/tests/tzdata/2019a/44/le/metaZones.res")
dest = "tzdata/metaZones.res"
},
{
path = rebase_path(
"//flutter/shell/platform/fuchsia/flutter/tests/tzdata/2019a/44/le/timezoneTypes.res")
dest = "tzdata/timezoneTypes.res"
},
{
path = rebase_path(
"//flutter/shell/platform/fuchsia/flutter/tests/tzdata/2019a/44/le/zoneinfo64.res")
dest = "tzdata/zoneinfo64.res"
},
]
cmx_file = rebase_path("meta/$target_name.cmx")
}
fuchsia_test_archive("flutter_runner_tzdata_tests") {
deps = [ ":flutter_runner_tzdata_unittests" ]
binary = "$target_name"
resources = [
{
path = rebase_path("//third_party/icu/common/icudtl.dat")
dest = "icudtl.dat"
},
]
}
fuchsia_test_archive("fml_tests") {
deps = [ "//flutter/fml:fml_unittests" ]
binary = "fml_unittests"
}
fuchsia_test_archive("flow_tests") {
deps = [ "//flutter/flow:flow_unittests" ]
binary = "flow_unittests"
resources = [
{
path = rebase_path(
"//flutter/testing/resources/performance_overlay_gold_60fps.png")
dest = "flutter/testing/resources/performance_overlay_gold_60fps.png"
},
{
path = rebase_path(
"//flutter/testing/resources/performance_overlay_gold_90fps.png")
dest = "flutter/testing/resources/performance_overlay_gold_90fps.png"
},
{
path = rebase_path(
"//flutter/testing/resources/performance_overlay_gold_120fps.png")
dest = "flutter/testing/resources/performance_overlay_gold_120fps.png"
},
]
}
fuchsia_test_archive("runtime_tests") {
deps = [
"//flutter/runtime:runtime_fixtures",
"//flutter/runtime:runtime_unittests",
]
binary = "runtime_unittests"
# TODO(gw280): https://github.com/flutter/flutter/issues/50294
# Right now we need to manually specify all the fixtures that are
# declared in the test_fixtures() call above.
resources = [
{
path = "$root_gen_dir/flutter/runtime/assets/kernel_blob.bin"
dest = "assets/kernel_blob.bin"
},
]
}
fuchsia_test_archive("shell_tests") {
deps = [
"//flutter/shell/common:shell_unittests",
"//flutter/shell/common:shell_unittests_fixtures",
]
binary = "shell_unittests"
# TODO(gw280): https://github.com/flutter/flutter/issues/50294
# Right now we need to manually specify all the fixtures that are
# declared in the test_fixtures() call above.
resources = [
{
path = "$root_gen_dir/flutter/shell/common/assets/kernel_blob.bin"
dest = "assets/kernel_blob.bin"
},
{
path =
"$root_gen_dir/flutter/shell/common/assets/shelltest_screenshot.png"
dest = "assets/shelltest_screenshot.png"
},
]
libraries = vulkan_validation_libs
resources += vulkan_icds
}
fuchsia_test_archive("testing_tests") {
deps = [ "//flutter/testing:testing_unittests" ]
binary = "testing_unittests"
}
fuchsia_test_archive("txt_tests") {
deps = [ "//flutter/third_party/txt:txt_unittests" ]
binary = "txt_unittests"
resources = [
{
path = rebase_path("//third_party/icu/common/icudtl.dat")
dest = "icudtl.dat"
},
{
path = rebase_path("//third_party/icu/common/icudtl.dat")
dest = "icudtl2.dat"
},
]
}
fuchsia_test_archive("ui_tests") {
deps = [
"//flutter/lib/ui:ui_unittests",
"//flutter/lib/ui:ui_unittests_fixtures",
]
binary = "ui_unittests"
# TODO(gw280): https://github.com/flutter/flutter/issues/50294
# Right now we need to manually specify all the fixtures that are
# declared in the test_fixtures() call above.
resources = [
{
path = "$root_gen_dir/flutter/lib/ui/assets/kernel_blob.bin"
dest = "assets/kernel_blob.bin"
},
{
path = "$root_gen_dir/flutter/lib/ui/assets/DashInNooglerHat.jpg"
dest = "assets/DashInNooglerHat.jpg"
},
{
path = "$root_gen_dir/flutter/lib/ui/assets/Horizontal.jpg"
dest = "assets/Horizontal.jpg"
},
{
path = "$root_gen_dir/flutter/lib/ui/assets/Horizontal.png"
dest = "assets/Horizontal.png"
},
{
path = "$root_gen_dir/flutter/lib/ui/assets/hello_loop_2.gif"
dest = "assets/hello_loop_2.gif"
},
{
path = "$root_gen_dir/flutter/lib/ui/assets/hello_loop_2.webp"
dest = "assets/hello_loop_2.webp"
},
]
libraries = vulkan_validation_libs
resources += vulkan_icds
}
fuchsia_test_archive("embedder_tests") {
deps = [
"//flutter/shell/platform/embedder:embedder_unittests",
"//flutter/shell/platform/embedder:fixtures",
]
binary = "embedder_unittests"
# TODO(gw280): https://github.com/flutter/flutter/issues/50294
# Right now we need to manually specify all the fixtures that are
# declared in the test_fixtures() call above.
resources = [
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/kernel_blob.bin"
dest = "assets/kernel_blob.bin"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/arc_end_caps.png"
dest = "assets/arc_end_caps.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/compositor.png"
dest = "assets/compositor.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/compositor_root_surface_xformation.png"
dest = "assets/compositor_root_surface_xformation.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/compositor_software.png"
dest = "assets/compositor_software.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/compositor_with_platform_layer_on_bottom.png"
dest = "assets/compositor_with_platform_layer_on_bottom.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/compositor_with_root_layer_only.png"
dest = "assets/compositor_with_root_layer_only.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/dpr_noxform.png"
dest = "assets/dpr_noxform.png"
},
{
path =
"$root_gen_dir/flutter/shell/platform/embedder/assets/dpr_xform.png"
dest = "assets/dpr_xform.png"
},
{
path =
"$root_gen_dir/flutter/shell/platform/embedder/assets/gradient.png"
dest = "assets/gradient.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/gradient_xform.png"
dest = "assets/gradient_xform.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/scene_without_custom_compositor.png"
dest = "assets/scene_without_custom_compositor.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/scene_without_custom_compositor_with_xform.png"
dest = "assets/scene_without_custom_compositor_with_xform.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/snapshot_large_scene.png"
dest = "assets/snapshot_large_scene.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/verifyb143464703.png"
dest = "assets/verifyb143464703.png"
},
{
path = "$root_gen_dir/flutter/shell/platform/embedder/assets/verifyb143464703_soft_noxform.png"
dest = "assets/verifyb143464703_soft_noxform.png"
},
]
}
fuchsia_test_archive("dart_utils_tests") {
deps = [ "//flutter/shell/platform/fuchsia/runtime/dart/utils:dart_utils_unittests" ]
binary = "dart_utils_unittests"
}
# When adding a new dep here, please also ensure the dep is added to
# testing/fuchsia/run_tests.sh and testing/fuchsia/test_fars
group("tests") {
testonly = true
deps = [
":dart_utils_tests",
":embedder_tests",
":flow_tests",
":flutter_runner_tests",
":flutter_runner_tzdata_tests",
":fml_tests",
":runtime_tests",
":shell_tests",
":testing_tests",
":txt_tests",
":ui_tests",
"integration_flutter_tests",
]
}
}

44
engine/src/flutter/tools/fuchsia/fuchsia_libs.gni
View File

@ -9,6 +9,24 @@ fuchsia_sdk_dist = "$fuchsia_sdk_base/dist"
sysroot_lib = "$fuchsia_sdk_base/sysroot/lib"
sysroot_dist_lib = "$fuchsia_sdk_base/sysroot/dist/lib"
ld_so_path = ""
libcxx_so_2_path = "${clang_manifest_json.md5_19df03aecdc9eb27bc8b4038352f2b27}"
libcxx_abi_so_1_path =
"${clang_manifest_json.md5_6aff1b5f218d4a9278d85d63d0695af8}"
libunwind_so_1_path =
"${clang_manifest_json.md5_fb2bd871885ef42c2cf3138655f901ed}"
if (is_asan) {
ld_so_path = "asan/"
libcxx_so_2_path =
"${clang_manifest_json.md5_07cbd4a04b921d2ca61badc1b15a3b0b}"
libcxx_abi_so_1_path =
"${clang_manifest_json.md5_18f605e8fd52a92c5f9c6fde9be8206c}"
libunwind_so_1_path =
"${clang_manifest_json.md5_85b659ccd825be02f123e3479f1bc280}"
libclang_rt_so_path =
"${clang_manifest_json.md5_b76b69d6ab2c13408b7a3608f925b0c6}"
}
common_libs = [
{
name = "libasync-default.so"
@ -40,27 +58,35 @@ common_libs = [
},
{
name = "ld.so.1"
path = rebase_path("$sysroot_dist_lib")
path = rebase_path("$sysroot_dist_lib/$ld_so_path")
},
]
# Note, we use the md5 hashes here because of gn limitations of json parsing.
# This is a hack, and we can migrate to a better way soon.
# Note, for clang libs we use the md5 hashes here because of gn limitations of
# json parsing.
# This is a hack, and we can migrate to a better way soon.
common_libs += [
{
name = "libc++.so.2"
path = rebase_path(
"$clang_base/${clang_manifest_json.md5_19df03aecdc9eb27bc8b4038352f2b27}")
path = rebase_path("$clang_base/$libcxx_so_2_path")
},
{
name = "libc++abi.so.1"
path = rebase_path(
"$clang_base/${clang_manifest_json.md5_6aff1b5f218d4a9278d85d63d0695af8}")
path = rebase_path("$clang_base/$libcxx_abi_so_1_path")
},
{
name = "libunwind.so.1"
path = rebase_path(
"$clang_base/${clang_manifest_json.md5_fb2bd871885ef42c2cf3138655f901ed}")
path = rebase_path("$clang_base/$libunwind_so_1_path")
},
]
if (is_asan) {
common_libs += [
{
name = "libclang_rt.asan.so"
path = rebase_path("$clang_base/$libclang_rt_so_path")
},
]
}
vulkan_dist = "$fuchsia_sdk_base/dist"

4
engine/src/flutter/tools/gn
View File

@ -131,6 +131,8 @@ def to_gn_args(args):
gn_args['bitcode_marker'] = True
gn_args['enable_bitcode'] = args.bitcode
if args.enable_unittests:
gn_args['enable_unittests'] = args.enable_unittests
# Skia GN args.
gn_args['skia_enable_flutter_defines'] = True # Enable Flutter API guards in Skia.
@ -395,6 +397,8 @@ def parse_args(args):
parser.add_argument('--unoptimized', default=False, action='store_true')
parser.add_argument('--enable-unittests', action='store_true', default=False)
parser.add_argument('--runtime-mode', type=str, choices=['debug', 'profile', 'release', 'jit_release'], default='debug')
parser.add_argument('--interpreter', default=False, action='store_true')
parser.add_argument('--dart-debug', default=False, action='store_true', help='Enables assertions in the Dart VM. ' +