Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[fuchsia] Create CFv2 dart_runner. #28519

Closed
wants to merge 12 commits into from
Closed

[fuchsia] Create CFv2 dart_runner. #28519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
52522bc
[fuchsia] Add CML files for dart_runner Cfv2.
akbiggs Sep 7, 2021
d621a27
[fuchsia] Format fixes, removing archive tool changes
akbiggs Sep 7, 2021
793ec39
[fuchsia] WIP dart_runner v2 split
akbiggs Sep 7, 2021
874cc31
[fuchsia] Fix some formatting issues.
akbiggs Sep 8, 2021
4393548
[fuchsia] Add code for component controller.
akbiggs Sep 8, 2021
9355635
[fuchsia] Add parse url utility.
akbiggs Sep 8, 2021
82a7cad
[fuchsia] Format fix.
akbiggs Sep 8, 2021
10dc607
[fuchsia] Make the component controller compile.
akbiggs Sep 8, 2021
31bd5de
[fuchsia] bad merge
akbiggs Sep 8, 2021
5a48c09
[fuchsia] Format
akbiggs Sep 8, 2021
55e088f
[fuchsia] Update licensees.
akbiggs Sep 8, 2021
e9cfd49
[fuchsia] temp debugging logic
akbiggs Sep 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ci/licenses_golden/licenses_flutter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1367,6 +1367,10 @@ FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/builtin_libraries.cc
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/builtin_libraries.h
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_component_controller.cc
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_component_controller.h
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_component_controller_v1.cc
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_component_controller_v1.h
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_component_controller_v2.cc
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_component_controller_v2.h
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_runner.cc
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_runner.h
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/builtin.dart
Expand All @@ -1392,6 +1396,8 @@ FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_jit_runner.c
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_zircon_test.cmx
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/jit_product_runtime
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/jit_runtime
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/parse_url.cc
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/parse_url.h
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/service_isolate.cc
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/service_isolate.h
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/vmservice/empty.dart
Expand Down
11 changes: 7 additions & 4 deletions shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,13 @@ void Initialize(fidl::InterfaceHandle<fuchsia::sys::Environment> environment,
dart_state->class_library().add_provider("fuchsia",
std::move(fuchsia_class_provider));

result = Dart_SetField(
library, ToDart("_environment"),
ToDart(zircon::dart::Handle::Create(environment.TakeChannel())));
FML_CHECK(!tonic::LogIfError(result));
// V2 components do not use the environment.
if (environment) {
result = Dart_SetField(
library, ToDart("_environment"),
ToDart(zircon::dart::Handle::Create(environment.TakeChannel())));
FML_CHECK(!tonic::LogIfError(result));
}

if (directory_request) {
result = Dart_SetField(
Expand Down
9 changes: 9 additions & 0 deletions shell/platform/fuchsia/dart_runner/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,16 @@ template("runner") {
"builtin_libraries.h",
"dart_component_controller.cc",
"dart_component_controller.h",
"dart_component_controller_v1.cc",
"dart_component_controller_v1.h",
"dart_component_controller_v2.cc",
"dart_component_controller_v2.h",
"dart_runner.cc",
"dart_runner.h",
"logging.h",
"main.cc",
"parse_url.cc",
"parse_url.h",
"service_isolate.cc",
"service_isolate.h",
]
Expand Down Expand Up @@ -69,6 +75,7 @@ template("runner") {
"//flutter/fml",
"//flutter/shell/platform/fuchsia/dart-pkg/fuchsia",
"//flutter/shell/platform/fuchsia/dart-pkg/zircon",
"$fuchsia_sdk_root/fidl:fuchsia.component.runner",
"$fuchsia_sdk_root/pkg:async",
"$fuchsia_sdk_root/pkg:async-cpp",
"$fuchsia_sdk_root/pkg:async-default",
Expand Down Expand Up @@ -160,6 +167,7 @@ template("aot_runner_package") {
binary = "dart_aot${product_suffix}_runner"

cmx_file = rebase_path("meta/dart_aot${product_suffix}_runner.cmx")
cml_file = rebase_path("meta/dart_aot${product_suffix}_runner.cml")

libraries = _common_runner_libs

Expand Down Expand Up @@ -220,6 +228,7 @@ template("jit_runner_package") {
binary = "dart_jit${product_suffix}_runner"

cmx_file = rebase_path("meta/dart_jit${product_suffix}_runner.cmx")
cml_file = rebase_path("meta/dart_jit${product_suffix}_runner.cml")

libraries = _common_runner_libs

Expand Down
Loading