From e94c9dd5759fe531fe16d2b4eb8967408386dc6d Mon Sep 17 00:00:00 2001 From: Sebastien Marchand Date: Wed, 19 Oct 2022 02:55:10 +0000 Subject: [PATCH 1/2] Bump the Fuchsia target API level to 10 --- tools/fuchsia/target_api_level | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/fuchsia/target_api_level b/tools/fuchsia/target_api_level index ec635144f6004..f599e28b8ab0d 100644 --- a/tools/fuchsia/target_api_level +++ b/tools/fuchsia/target_api_level @@ -1 +1 @@ -9 +10 From ce01206d698a8127563d9ffe11aaecb695e01ecf Mon Sep 17 00:00:00 2001 From: Sebastien Marchand Date: Wed, 19 Oct 2022 02:55:10 +0000 Subject: [PATCH 2/2] Bump the Fuchsia target API level to 10 --- .../fuchsia/dart_runner/dart_test_component_controller.cc | 2 +- shell/platform/fuchsia/flutter/component_v1.cc | 8 ++++---- tools/fuchsia/target_api_level | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc b/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc index 5670d7306cf68..a1786e26497c5 100644 --- a/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc +++ b/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc @@ -178,7 +178,7 @@ void DartTestComponentController::SetUp() { suite_context_ = sys::ComponentContext::Create(); suite_context_->outgoing()->AddPublicService(this->GetHandler()); suite_context_->outgoing()->Serve( - start_info_.mutable_outgoing_dir()->TakeChannel(), loop_->dispatcher()); + std::move(*start_info_.mutable_outgoing_dir()), loop_->dispatcher()); loop_->Run(); } diff --git a/shell/platform/fuchsia/flutter/component_v1.cc b/shell/platform/fuchsia/flutter/component_v1.cc index b9a8674f65c0a..bc58d846538f9 100644 --- a/shell/platform/fuchsia/flutter/component_v1.cc +++ b/shell/platform/fuchsia/flutter/component_v1.cc @@ -159,16 +159,16 @@ ComponentV1::ComponentV1( continue; } - zx::channel dir; + fidl::InterfaceHandle dir; if (path == kServiceRootPath) { svc_ = std::make_unique( std::move(startup_info.flat_namespace.directories.at(i))); - dir = svc_->CloneChannel().TakeChannel(); + dir = svc_->CloneChannel(); } else { dir = std::move(startup_info.flat_namespace.directories.at(i)); } - zx_handle_t dir_handle = dir.release(); + zx_handle_t dir_handle = dir.TakeChannel().release(); if (fdio_ns_bind(fdio_ns_.get(), path.data(), dir_handle) != ZX_OK) { FML_LOG(ERROR) << "Could not bind path to namespace: " << path; zx_handle_close(dir_handle); @@ -199,7 +199,7 @@ ComponentV1::ComponentV1( outgoing_dir_->Serve(fuchsia::io::OpenFlags::RIGHT_READABLE | fuchsia::io::OpenFlags::RIGHT_WRITABLE | fuchsia::io::OpenFlags::DIRECTORY, - std::move(launch_info.directory_request)); + launch_info.directory_request.TakeChannel()); } directory_request_ = directory_ptr_.NewRequest(); diff --git a/tools/fuchsia/target_api_level b/tools/fuchsia/target_api_level index ec635144f6004..f599e28b8ab0d 100644 --- a/tools/fuchsia/target_api_level +++ b/tools/fuchsia/target_api_level @@ -1 +1 @@ -9 +10