firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uprev fuchsia components (#162338)

Browse Source 
Updates fuchsia sdk, gn-sdk and test-scripts to the latest versions. It
should recover the fuchsia LSC which needs the latest combination of
fuchsia sdk and test-scripts. And since I am here, I'd update the gn-sdk
as well.

Unfortunately this CL needs extra code changes due to the API changes,
but they are fairly straightforward.

## 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].
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] I updated/added relevant documentation (doc comments with `///`).
- [x] 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.
- [x] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel
on [Discord].

<!-- Links -->
[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
This commit is contained in:
zijiehe@ 2025-02-04 10:56:14 -08:00 committed by GitHub
parent aa27e785e0
commit 950b5ac7b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 3220 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DEPS
View File

@ -214,7 +214,7 @@ vars = {
# The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
# used altogether with fuchsia-sdk to generate gn based build rules.
'fuchsia_gn_sdk_version': 'tHRCseOuPnZ5H4a7kb4Zl6YQ2rhEDWIzcEX3G9NPFhkC',
'fuchsia_gn_sdk_version': 'T6ahk2PZvX-n2RabPqFNTu_AL3tTBGgQMnfAOavwCtsC',
}
gclient_gn_args_file = 'engine/src/flutter/third_party/dart/build/config/gclient_args.gni'
@ -806,7 +806,7 @@ deps = {
'packages': [
{
'package': 'fuchsia/sdk/core/linux-amd64',
'version': 'zvsXvTuk-Z1Mgtn34lhXHPbQAAPOVrHYuEZZJqa6N9oC'
'version': 'g-2SJtblPjjaH7EgyS_D6qFaRn8m5zaW0M-ylODrRuIC'
}
],
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

10
engine/src/flutter/ci/licenses_golden/excluded_files
View File

@ -3407,6 +3407,7 @@
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.mailbox/meta.json
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network.driver/meta.json
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/meta.json
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.nfc/meta.json
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.pci/meta.json
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.pin/meta.json
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.pinimpl/meta.json
@ -3557,6 +3558,9 @@
../../../fuchsia/sdk/linux/obj/arm64-api-25/sysroot/dist/lib/asan/ld.so.1
../../../fuchsia/sdk/linux/obj/arm64-api-25/sysroot/dist/lib/hwasan/ld.so.1
../../../fuchsia/sdk/linux/obj/arm64-api-25/sysroot/dist/lib/ld.so.1
../../../fuchsia/sdk/linux/obj/arm64-api-26/sysroot/dist/lib/asan/ld.so.1
../../../fuchsia/sdk/linux/obj/arm64-api-26/sysroot/dist/lib/hwasan/ld.so.1
../../../fuchsia/sdk/linux/obj/arm64-api-26/sysroot/dist/lib/ld.so.1
../../../fuchsia/sdk/linux/obj/arm64-api-NEXT/sysroot/dist/lib/asan/ld.so.1
../../../fuchsia/sdk/linux/obj/arm64-api-NEXT/sysroot/dist/lib/hwasan/ld.so.1
../../../fuchsia/sdk/linux/obj/arm64-api-NEXT/sysroot/dist/lib/ld.so.1
@ -3572,6 +3576,8 @@
../../../fuchsia/sdk/linux/obj/riscv64-api-24/sysroot/dist/lib/ld.so.1
../../../fuchsia/sdk/linux/obj/riscv64-api-25/sysroot/dist/lib/asan/ld.so.1
../../../fuchsia/sdk/linux/obj/riscv64-api-25/sysroot/dist/lib/ld.so.1
../../../fuchsia/sdk/linux/obj/riscv64-api-26/sysroot/dist/lib/asan/ld.so.1
../../../fuchsia/sdk/linux/obj/riscv64-api-26/sysroot/dist/lib/ld.so.1
../../../fuchsia/sdk/linux/obj/riscv64-api-NEXT/sysroot/dist/lib/asan/ld.so.1
../../../fuchsia/sdk/linux/obj/riscv64-api-NEXT/sysroot/dist/lib/ld.so.1
../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/dist/lib/asan/ld.so.1
@ -3586,11 +3592,15 @@
../../../fuchsia/sdk/linux/obj/x64-api-24/sysroot/dist/lib/ld.so.1
../../../fuchsia/sdk/linux/obj/x64-api-25/sysroot/dist/lib/asan/ld.so.1
../../../fuchsia/sdk/linux/obj/x64-api-25/sysroot/dist/lib/ld.so.1
../../../fuchsia/sdk/linux/obj/x64-api-26/sysroot/dist/lib/asan/ld.so.1
../../../fuchsia/sdk/linux/obj/x64-api-26/sysroot/dist/lib/ld.so.1
../../../fuchsia/sdk/linux/obj/x64-api-NEXT/sysroot/dist/lib/asan/ld.so.1
../../../fuchsia/sdk/linux/obj/x64-api-NEXT/sysroot/dist/lib/ld.so.1
../../../fuchsia/sdk/linux/packages/blobs
../../../fuchsia/sdk/linux/packages/cmd-buf-benchmark-test/meta.json
../../../fuchsia/sdk/linux/packages/fake-build-info/meta.json
../../../fuchsia/sdk/linux/packages/heapdump-collector/meta.json
../../../fuchsia/sdk/linux/packages/intl_property_manager/meta.json
../../../fuchsia/sdk/linux/packages/magma_conformance_tests/meta.json
../../../fuchsia/sdk/linux/packages/realm_builder_server/meta.json
../../../fuchsia/sdk/linux/packages/vkcopy-test/meta.json

3159
engine/src/flutter/ci/licenses_golden/licenses_fuchsia
View File

File diff suppressed because it is too large Load Diff

10
engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_component_controller.cc
View File

@ -223,7 +223,8 @@ bool DartComponentController::CreateAndBindNamespace() {
}
auto composed_service_dir = std::make_unique<vfs::ComposedServiceDir>();
composed_service_dir->set_fallback(std::move(dart_public_dir));
composed_service_dir->SetFallback(
fidl::ClientEnd<fuchsia_io::Directory>(dart_public_dir.TakeChannel()));
// Request an event from the directory to ensure it is servicing requests.
dart_outgoing_dir_ptr_->Open3(
@ -633,4 +634,11 @@ void DartComponentController::OnIdleTimer(async_dispatcher_t* dispatcher,
wait->Begin(dispatcher); // ignore errors
}
void DartComponentController::handle_unknown_method(uint64_t ordinal,
bool method_has_response) {
FML_LOG(ERROR) << "Unknown method called on DartComponentController. "
"Ordinal: "
<< ordinal;
}
} // namespace dart_runner

3
engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_component_controller.h
View File

@ -48,6 +48,9 @@ class DartComponentController
/// This should be called after |SetUp|.
void Run();
void handle_unknown_method(uint64_t ordinal,
bool method_has_response) override;
private:
/// Helper for actually running the Dart main. Returns true if successful,
/// false otherwise.

6
engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_runner.cc
View File

@ -276,4 +276,10 @@ void DartRunner::Start(
}
}
void DartRunner::handle_unknown_method(uint64_t ordinal,
bool method_has_response) {
FML_LOG(ERROR) << "Unknown method called on DartRunner. Ordinal: "
<< ordinal;
}
} // namespace dart_runner

3
engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_runner.h
View File

@ -19,6 +19,9 @@ class DartRunner : public fuchsia::component::runner::ComponentRunner {
explicit DartRunner(sys::ComponentContext* context);
~DartRunner() override;
void handle_unknown_method(uint64_t ordinal,
bool method_has_response) override;
private:
// |fuchsia::component::runner::ComponentRunner| implementation:
void Start(

8
engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc
View File

@ -667,4 +667,12 @@ void DartTestComponentController::OnIdleTimer(async_dispatcher_t* dispatcher,
wait->Begin(dispatcher); // ignore errors
}
void DartTestComponentController::handle_unknown_method(
uint64_t ordinal,
bool method_has_response) {
FML_LOG(ERROR) << "Unknown method called on DartTestComponentController. "
"Ordinal: "
<< ordinal;
}
} // namespace dart_runner

3
engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_test_component_controller.h
View File

@ -65,6 +65,9 @@ class DartTestComponentController
return suite_bindings_.GetHandler(this, loop_->dispatcher());
}
void handle_unknown_method(uint64_t ordinal,
bool method_has_response) override;
private:
/// Helper for actually running the Dart main. Returns a promise.
fpromise::promise<> RunDartMain();

10
engine/src/flutter/shell/platform/fuchsia/flutter/component_v2.cc
View File

@ -12,6 +12,7 @@
#include <lib/fdio/directory.h>
#include <lib/fdio/io.h>
#include <lib/fdio/namespace.h>
#include <lib/fidl/cpp/client.h>
#include <lib/vfs/cpp/composed_service_dir.h>
#include <lib/vfs/cpp/remote_dir.h>
#include <lib/vfs/cpp/service.h>
@ -267,7 +268,8 @@ ComponentV2::ComponentV2(
}
auto composed_service_dir = std::make_unique<vfs::ComposedServiceDir>();
composed_service_dir->set_fallback(std::move(flutter_public_dir));
composed_service_dir->SetFallback(
fidl::ClientEnd<fuchsia_io::Directory>(flutter_public_dir.TakeChannel()));
// Request an event from the directory to ensure it is servicing requests.
directory_ptr_->Open3(".",
@ -658,4 +660,10 @@ void ComponentV2::WriteProfileToTrace() const {
}
#endif // !defined(DART_PRODUCT)
void ComponentV2::handle_unknown_method(uint64_t ordinal,
bool method_has_response) {
FML_LOG(ERROR) << "Unknown method called on ComponentV2. Ordinal: "
<< ordinal;
}
} // namespace flutter_runner

3
engine/src/flutter/shell/platform/fuchsia/flutter/component_v2.h
View File

@ -86,6 +86,9 @@ class ComponentV2 final
void WriteProfileToTrace() const;
#endif // !defined(DART_PRODUCT)
void handle_unknown_method(uint64_t ordinal,
bool method_has_response) override;
private:
ComponentV2(
TerminationCallback termination_callback,

4
engine/src/flutter/shell/platform/fuchsia/flutter/runner.cc
View File

@ -343,4 +343,8 @@ void Runner::SetupTraceObserver() {
}
#endif // !defined(DART_PRODUCT)
void Runner::handle_unknown_method(uint64_t ordinal, bool method_has_response) {
FML_LOG(ERROR) << "Unknown method called on Runner. Ordinal: " << ordinal;
}
} // namespace flutter_runner

3
engine/src/flutter/shell/platform/fuchsia/flutter/runner.h
View File

@ -37,6 +37,9 @@ class Runner final
~Runner();
void handle_unknown_method(uint64_t ordinal,
bool method_has_response) override;
private:
// CF v2 lifecycle methods.