Skip to content

Commit 950b5ac

Browse files
zijiehe-google-comzijiehe-google-com
authored
Uprev fuchsia components (#162338)
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
1 parent aa27e78 commit 950b5ac

File tree

13 files changed

+3220
-6
lines changed

13 files changed

+3220
-6
lines changed

‎DEPS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ vars = {
214214

215215
# The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
216216
# used altogether with fuchsia-sdk to generate gn based build rules.
217-
'fuchsia_gn_sdk_version': 'tHRCseOuPnZ5H4a7kb4Zl6YQ2rhEDWIzcEX3G9NPFhkC',
217+
'fuchsia_gn_sdk_version': 'T6ahk2PZvX-n2RabPqFNTu_AL3tTBGgQMnfAOavwCtsC',
218218
}
219219

220220
gclient_gn_args_file = 'engine/src/flutter/third_party/dart/build/config/gclient_args.gni'
@@ -806,7 +806,7 @@ deps = {
806806
'packages': [
807807
{
808808
'package': 'fuchsia/sdk/core/linux-amd64',
809-
'version': 'zvsXvTuk-Z1Mgtn34lhXHPbQAAPOVrHYuEZZJqa6N9oC'
809+
'version': 'g-2SJtblPjjaH7EgyS_D6qFaRn8m5zaW0M-ylODrRuIC'
810810
}
811811
],
812812
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

‎engine/src/flutter/ci/licenses_golden/excluded_files

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3407,6 +3407,7 @@
34073407
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.mailbox/meta.json
34083408
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network.driver/meta.json
34093409
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.network/meta.json
3410+
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.nfc/meta.json
34103411
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.pci/meta.json
34113412
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.pin/meta.json
34123413
../../../fuchsia/sdk/linux/fidl/fuchsia.hardware.pinimpl/meta.json
@@ -3557,6 +3558,9 @@
35573558
../../../fuchsia/sdk/linux/obj/arm64-api-25/sysroot/dist/lib/asan/ld.so.1
35583559
../../../fuchsia/sdk/linux/obj/arm64-api-25/sysroot/dist/lib/hwasan/ld.so.1
35593560
../../../fuchsia/sdk/linux/obj/arm64-api-25/sysroot/dist/lib/ld.so.1
3561+
../../../fuchsia/sdk/linux/obj/arm64-api-26/sysroot/dist/lib/asan/ld.so.1
3562+
../../../fuchsia/sdk/linux/obj/arm64-api-26/sysroot/dist/lib/hwasan/ld.so.1
3563+
../../../fuchsia/sdk/linux/obj/arm64-api-26/sysroot/dist/lib/ld.so.1
35603564
../../../fuchsia/sdk/linux/obj/arm64-api-NEXT/sysroot/dist/lib/asan/ld.so.1
35613565
../../../fuchsia/sdk/linux/obj/arm64-api-NEXT/sysroot/dist/lib/hwasan/ld.so.1
35623566
../../../fuchsia/sdk/linux/obj/arm64-api-NEXT/sysroot/dist/lib/ld.so.1
@@ -3572,6 +3576,8 @@
35723576
../../../fuchsia/sdk/linux/obj/riscv64-api-24/sysroot/dist/lib/ld.so.1
35733577
../../../fuchsia/sdk/linux/obj/riscv64-api-25/sysroot/dist/lib/asan/ld.so.1
35743578
../../../fuchsia/sdk/linux/obj/riscv64-api-25/sysroot/dist/lib/ld.so.1
3579+
../../../fuchsia/sdk/linux/obj/riscv64-api-26/sysroot/dist/lib/asan/ld.so.1
3580+
../../../fuchsia/sdk/linux/obj/riscv64-api-26/sysroot/dist/lib/ld.so.1
35753581
../../../fuchsia/sdk/linux/obj/riscv64-api-NEXT/sysroot/dist/lib/asan/ld.so.1
35763582
../../../fuchsia/sdk/linux/obj/riscv64-api-NEXT/sysroot/dist/lib/ld.so.1
35773583
../../../fuchsia/sdk/linux/obj/x64-api-16/sysroot/dist/lib/asan/ld.so.1
@@ -3586,11 +3592,15 @@
35863592
../../../fuchsia/sdk/linux/obj/x64-api-24/sysroot/dist/lib/ld.so.1
35873593
../../../fuchsia/sdk/linux/obj/x64-api-25/sysroot/dist/lib/asan/ld.so.1
35883594
../../../fuchsia/sdk/linux/obj/x64-api-25/sysroot/dist/lib/ld.so.1
3595+
../../../fuchsia/sdk/linux/obj/x64-api-26/sysroot/dist/lib/asan/ld.so.1
3596+
../../../fuchsia/sdk/linux/obj/x64-api-26/sysroot/dist/lib/ld.so.1
35893597
../../../fuchsia/sdk/linux/obj/x64-api-NEXT/sysroot/dist/lib/asan/ld.so.1
35903598
../../../fuchsia/sdk/linux/obj/x64-api-NEXT/sysroot/dist/lib/ld.so.1
35913599
../../../fuchsia/sdk/linux/packages/blobs
35923600
../../../fuchsia/sdk/linux/packages/cmd-buf-benchmark-test/meta.json
3601+
../../../fuchsia/sdk/linux/packages/fake-build-info/meta.json
35933602
../../../fuchsia/sdk/linux/packages/heapdump-collector/meta.json
3603+
../../../fuchsia/sdk/linux/packages/intl_property_manager/meta.json
35943604
../../../fuchsia/sdk/linux/packages/magma_conformance_tests/meta.json
35953605
../../../fuchsia/sdk/linux/packages/realm_builder_server/meta.json
35963606
../../../fuchsia/sdk/linux/packages/vkcopy-test/meta.json

‎engine/src/flutter/ci/licenses_golden/licenses_fuchsia

Lines changed: 3157 additions & 2 deletions
Large diffs are not rendered by default.

‎engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_component_controller.cc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,8 @@ bool DartComponentController::CreateAndBindNamespace() {
223223
}
224224

225225
auto composed_service_dir = std::make_unique<vfs::ComposedServiceDir>();
226-
composed_service_dir->set_fallback(std::move(dart_public_dir));
226+
composed_service_dir->SetFallback(
227+
fidl::ClientEnd<fuchsia_io::Directory>(dart_public_dir.TakeChannel()));
227228

228229
// Request an event from the directory to ensure it is servicing requests.
229230
dart_outgoing_dir_ptr_->Open3(
@@ -633,4 +634,11 @@ void DartComponentController::OnIdleTimer(async_dispatcher_t* dispatcher,
633634
wait->Begin(dispatcher); // ignore errors
634635
}
635636

637+
void DartComponentController::handle_unknown_method(uint64_t ordinal,
638+
bool method_has_response) {
639+
FML_LOG(ERROR) << "Unknown method called on DartComponentController. "
640+
"Ordinal: "
641+
<< ordinal;
642+
}
643+
636644
} // namespace dart_runner

‎engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_component_controller.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ class DartComponentController
4848
/// This should be called after |SetUp|.
4949
void Run();
5050

51+
void handle_unknown_method(uint64_t ordinal,
52+
bool method_has_response) override;
53+
5154
private:
5255
/// Helper for actually running the Dart main. Returns true if successful,
5356
/// false otherwise.

‎engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_runner.cc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,4 +276,10 @@ void DartRunner::Start(
276276
}
277277
}
278278

279+
void DartRunner::handle_unknown_method(uint64_t ordinal,
280+
bool method_has_response) {
281+
FML_LOG(ERROR) << "Unknown method called on DartRunner. Ordinal: "
282+
<< ordinal;
283+
}
284+
279285
} // namespace dart_runner

‎engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_runner.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ class DartRunner : public fuchsia::component::runner::ComponentRunner {
1919
explicit DartRunner(sys::ComponentContext* context);
2020
~DartRunner() override;
2121

22+
void handle_unknown_method(uint64_t ordinal,
23+
bool method_has_response) override;
24+
2225
private:
2326
// |fuchsia::component::runner::ComponentRunner| implementation:
2427
void Start(

‎engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -667,4 +667,12 @@ void DartTestComponentController::OnIdleTimer(async_dispatcher_t* dispatcher,
667667
wait->Begin(dispatcher); // ignore errors
668668
}
669669

670+
void DartTestComponentController::handle_unknown_method(
671+
uint64_t ordinal,
672+
bool method_has_response) {
673+
FML_LOG(ERROR) << "Unknown method called on DartTestComponentController. "
674+
"Ordinal: "
675+
<< ordinal;
676+
}
677+
670678
} // namespace dart_runner

‎engine/src/flutter/shell/platform/fuchsia/dart_runner/dart_test_component_controller.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ class DartTestComponentController
6565
return suite_bindings_.GetHandler(this, loop_->dispatcher());
6666
}
6767

68+
void handle_unknown_method(uint64_t ordinal,
69+
bool method_has_response) override;
70+
6871
private:
6972
/// Helper for actually running the Dart main. Returns a promise.
7073
fpromise::promise<> RunDartMain();

‎engine/src/flutter/shell/platform/fuchsia/flutter/component_v2.cc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <lib/fdio/directory.h>
1313
#include <lib/fdio/io.h>
1414
#include <lib/fdio/namespace.h>
15+
#include <lib/fidl/cpp/client.h>
1516
#include <lib/vfs/cpp/composed_service_dir.h>
1617
#include <lib/vfs/cpp/remote_dir.h>
1718
#include <lib/vfs/cpp/service.h>
@@ -267,7 +268,8 @@ ComponentV2::ComponentV2(
267268
}
268269

269270
auto composed_service_dir = std::make_unique<vfs::ComposedServiceDir>();
270-
composed_service_dir->set_fallback(std::move(flutter_public_dir));
271+
composed_service_dir->SetFallback(
272+
fidl::ClientEnd<fuchsia_io::Directory>(flutter_public_dir.TakeChannel()));
271273

272274
// Request an event from the directory to ensure it is servicing requests.
273275
directory_ptr_->Open3(".",
@@ -658,4 +660,10 @@ void ComponentV2::WriteProfileToTrace() const {
658660
}
659661
#endif // !defined(DART_PRODUCT)
660662

663+
void ComponentV2::handle_unknown_method(uint64_t ordinal,
664+
bool method_has_response) {
665+
FML_LOG(ERROR) << "Unknown method called on ComponentV2. Ordinal: "
666+
<< ordinal;
667+
}
668+
661669
} // namespace flutter_runner

0 commit comments

Comments
 (0)