Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions shell/platform/fuchsia/flutter/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ template("runner_sources") {
"//flutter/assets",
"//flutter/common",
"//flutter/fml",
"//flutter/shell/platform/common/client_wrapper:client_wrapper_library_stubs",
"//flutter/vulkan",
]

Expand Down Expand Up @@ -507,6 +508,7 @@ if (enable_unittests) {
":flutter_runner_sources",
"//build/fuchsia/pkg:async-testing",
"//build/fuchsia/pkg:sys_cpp_testing",
"//flutter/shell/platform/common/client_wrapper:client_wrapper_library_stubs",
"//flutter/testing",
] + flutter_deps
}
Expand All @@ -525,6 +527,7 @@ if (enable_unittests) {
# embedder API.
flutter_deps = [
"//flutter/lib/ui",
"//flutter/shell/platform/common/client_wrapper:client_wrapper_library_stubs",
"//third_party/dart/runtime:libdart_jit",
"//third_party/dart/runtime/platform:libdart_platform_jit",
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ executable("flutter-embedder-test2-bin") {
"$fuchsia_sdk_root/pkg:zx",
"//flutter/shell/platform/fuchsia/flutter/integration_flutter_tests/fuchsia_testing/src/lib/ui/base_view",
"//flutter/shell/platform/fuchsia/flutter/integration_flutter_tests/fuchsia_testing/src/ui/testing/views",
"//third_party/dart/runtime:libdart_jit",
"//third_party/googletest:gtest_main",
]
}
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/fuchsia/flutter/platform_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ void PlatformView::OnKeyEvent(
}

void PlatformView::ActivateIme() {
DEBUG_CHECK(last_text_state_, LOG_TAG, "");
DEBUG_CHECK(last_text_state_ != nullptr, LOG_TAG, "");

text_sync_service_->GetInputMethodEditor(
fuchsia::ui::input::KeyboardType::TEXT, // keyboard type
Expand Down
14 changes: 12 additions & 2 deletions shell/platform/fuchsia/runtime/dart/utils/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ assert(is_fuchsia)

import("//build/fuchsia/sdk.gni")
import("//flutter/common/config.gni")
import("//flutter/testing/testing.gni")

config("utils_config") {
include_dirs = [ "../../.." ]
Expand Down Expand Up @@ -80,20 +81,29 @@ make_utils("utils") {
deps = [ "//third_party/dart/runtime/bin:elf_loader" ]
}

test_fixtures("utils_fixtures") {
fixtures = []
}

executable("dart_utils_unittests") {
testonly = true

output_name = "dart_utils_unittests"

sources = [ "build_info_unittests.cc" ]

# This is needed for //third_party/googletest for linking zircon symbols.
libs = [ "$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so" ]
libs = [
# This is needed for //third_party/googletest for linking zircon symbols.
"$fuchsia_sdk_path/arch/$target_cpu/sysroot/lib/libzircon.so",
]

deps = [
":utils",
":utils_fixtures",
"$fuchsia_sdk_root/pkg:sys_inspect_cpp",
"//flutter/testing",
"//third_party/dart/runtime:libdart_jit",
"//third_party/dart/runtime/bin:dart_io_api",
]
}

Expand Down