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

[fuchsia] make dart_runner work with cfv2 #27226

Merged
merged 1 commit into from
Jul 8, 2021
Merged

[fuchsia] make dart_runner work with cfv2 #27226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 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 @@ -1348,9 +1348,14 @@ FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/logging.h
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/main.cc
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/aot_product_runtime
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/aot_runtime
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/common.shard.cml
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_aot_product_runner.cml
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_aot_product_runner.cmx
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_aot_runner.cml
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_aot_runner.cmx
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_jit_product_runner.cml
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_jit_product_runner.cmx
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_jit_runner.cml
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_jit_runner.cmx
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_zircon_test.cmx
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/jit_product_runtime
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
2 changes: 2 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 @@ -58,6 +58,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 @@ -209,6 +210,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")
Copy link
Contributor

@akbiggs akbiggs Sep 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OOC I noticed we don't have a corresponding cml_file = dart_aot${product_suffix}_runner.cml line in this PR - is that an oversight or intentional?


libraries = common_libs

Expand Down
Loading