From 663275b4d355ab8dc5f1955e918ed8333d987f15 Mon Sep 17 00:00:00 2001 From: Jonny Wang Date: Tue, 30 Jan 2024 18:17:40 +0000 Subject: [PATCH] [fuchsia] Bump Fuchsia's API level to 16 --- .../fuchsia/dart_runner/dart_component_controller.cc | 5 +++++ shell/platform/fuchsia/flutter/component_v2.cc | 5 +++++ shell/platform/fuchsia/runtime/dart/utils/vmservice_object.h | 5 +++++ tools/fuchsia/target_api_level | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/shell/platform/fuchsia/dart_runner/dart_component_controller.cc b/shell/platform/fuchsia/dart_runner/dart_component_controller.cc index 1fc887cca4c08..a2dbb35ea4a23 100644 --- a/shell/platform/fuchsia/dart_runner/dart_component_controller.cc +++ b/shell/platform/fuchsia/dart_runner/dart_component_controller.cc @@ -216,9 +216,14 @@ bool DartComponentController::CreateAndBindNamespace() { fdio_service_connect_at(dart_outgoing_dir_ptr_.channel().get(), "svc", dart_public_dir.NewRequest().TakeChannel().release()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + auto composed_service_dir = std::make_unique(); composed_service_dir->set_fallback(std::move(dart_public_dir)); +#pragma clang diagnostic pop + // Clone and check if client is servicing the directory. dart_outgoing_dir_ptr_->Clone( fuchsia::io::OpenFlags::DESCRIBE | diff --git a/shell/platform/fuchsia/flutter/component_v2.cc b/shell/platform/fuchsia/flutter/component_v2.cc index 7e6ffab05f63f..a6e0de5af8528 100644 --- a/shell/platform/fuchsia/flutter/component_v2.cc +++ b/shell/platform/fuchsia/flutter/component_v2.cc @@ -259,9 +259,14 @@ ComponentV2::ComponentV2( fdio_service_connect_at(directory_ptr_.channel().get(), "svc", request.release()); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + auto composed_service_dir = std::make_unique(); composed_service_dir->set_fallback(std::move(flutter_public_dir)); +#pragma clang diagnostic pop + // Clone and check if client is servicing the directory. directory_ptr_->Clone(fuchsia::io::OpenFlags::DESCRIBE | fuchsia::io::OpenFlags::CLONE_SAME_RIGHTS, diff --git a/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.h b/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.h index 697922491a277..c02d609e51506 100644 --- a/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.h +++ b/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.h @@ -9,6 +9,9 @@ namespace dart_utils { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" + class VMServiceObject : public vfs::LazyDir { public: static constexpr const char* kDirName = "DartVM"; @@ -21,6 +24,8 @@ class VMServiceObject : public vfs::LazyDir { std::string name) const override; }; +#pragma clang diagnostic pop + } // namespace dart_utils #endif // FLUTTER_SHELL_PLATFORM_FUCHSIA_RUNTIME_DART_UTILS_VMSERVICE_OBJECT_H_ diff --git a/tools/fuchsia/target_api_level b/tools/fuchsia/target_api_level index 60d3b2f4a4cd5..b6a7d89c68e0c 100644 --- a/tools/fuchsia/target_api_level +++ b/tools/fuchsia/target_api_level @@ -1 +1 @@ -15 +16