From 44785daf01544fbb2762a81673f25370aa0818ce Mon Sep 17 00:00:00 2001 From: Byoungchan Lee Date: Wed, 5 Feb 2025 10:09:14 +0900 Subject: [PATCH] Roll gn to c97a86a72105f3328a540f5a5ab17d11989ab7dd (#161012) The current version is more than 3 years old. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [ ] I listed at least one issue that this PR fixes in the description above. - [ ] I updated/added relevant documentation (doc comments with `///`). - [ ] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [ ] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md --- DEPS | 2 +- engine/src/flutter/shell/gpu/BUILD.gn | 3 +-- engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn | 2 +- .../shell/platform/fuchsia/runtime/dart/utils/BUILD.gn | 2 +- engine/src/flutter/shell/platform/linux/BUILD.gn | 6 +++--- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/DEPS b/DEPS index 1cb0080561..afa1ab4fc2 100644 --- a/DEPS +++ b/DEPS @@ -644,7 +644,7 @@ deps = { 'packages': [ { 'package': 'gn/gn/${{platform}}', - 'version': 'git_revision:b79031308cc878488202beb99883ec1f2efd9a6d' + 'version': 'git_revision:c97a86a72105f3328a540f5a5ab17d11989ab7dd' }, ], 'dep_type': 'cipd', diff --git a/engine/src/flutter/shell/gpu/BUILD.gn b/engine/src/flutter/shell/gpu/BUILD.gn index ace6788674..ddbdcc0029 100644 --- a/engine/src/flutter/shell/gpu/BUILD.gn +++ b/engine/src/flutter/shell/gpu/BUILD.gn @@ -114,10 +114,9 @@ if (is_mac) { ] deps = [ - "//flutter/testing", ":gpu_surface_metal", - "//flutter/impeller/fixtures", "//flutter/fml", + "//flutter/impeller/fixtures", "//flutter/runtime", "//flutter/runtime:libdart", "//flutter/testing", diff --git a/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn index fad29d220b..1310f4a85d 100644 --- a/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn +++ b/engine/src/flutter/shell/platform/fuchsia/flutter/BUILD.gn @@ -520,11 +520,11 @@ if (enable_unittests) { ] deps = [ - "tests/fakes", ":flutter_runner_fixtures", ":flutter_runner_sources", "${fuchsia_sdk}/pkg/async-testing", "${fuchsia_sdk}/pkg/sys_cpp_testing", + "tests/fakes", "//flutter/shell/platform/common/client_wrapper:client_wrapper_library_stubs", "//flutter/testing", ] + flutter_deps diff --git a/engine/src/flutter/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn index 63f3cefe48..3a4a1bf0c0 100644 --- a/engine/src/flutter/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn +++ b/engine/src/flutter/shell/platform/fuchsia/runtime/dart/utils/BUILD.gn @@ -44,8 +44,8 @@ template("make_utils") { "${fuchsia_sdk}/pkg/async-loop-cpp", "${fuchsia_sdk}/pkg/async-loop-default", "${fuchsia_sdk}/pkg/fdio", - "${fuchsia_sdk}/pkg/sys_cpp", "${fuchsia_sdk}/pkg/inspect_component_cpp", + "${fuchsia_sdk}/pkg/sys_cpp", "${fuchsia_sdk}/pkg/trace", "${fuchsia_sdk}/pkg/vfs_cpp", "${fuchsia_sdk}/pkg/zx", diff --git a/engine/src/flutter/shell/platform/linux/BUILD.gn b/engine/src/flutter/shell/platform/linux/BUILD.gn index c9eb379250..5f6d955ddd 100644 --- a/engine/src/flutter/shell/platform/linux/BUILD.gn +++ b/engine/src/flutter/shell/platform/linux/BUILD.gn @@ -80,12 +80,12 @@ source_set("flutter_linux_sources") { "fl_binary_messenger_private.h", "fl_dart_project_private.h", "fl_engine_private.h", - "fl_keyboard_handler.h", - "fl_keyboard_manager.h", - "fl_key_event.h", "fl_key_channel_responder.h", "fl_key_embedder_responder.h", "fl_key_embedder_responder_private.h", + "fl_key_event.h", + "fl_keyboard_handler.h", + "fl_keyboard_manager.h", "fl_method_call_private.h", "fl_method_channel_private.h", "fl_method_codec_private.h",