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

Commit cd24385

Browse files
authored
Revert '[fuchsia] Make dart_runner work with cfv2' (#28036)
1 parent 27e90b8 commit cd24385

File tree

15 files changed

+187
-659
lines changed

15 files changed

+187
-659
lines changed

ci/licenses_golden/licenses_flutter

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1367,14 +1367,9 @@ FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/logging.h
13671367
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/main.cc
13681368
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/aot_product_runtime
13691369
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/aot_runtime
1370-
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/common.shard.cml
1371-
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_aot_product_runner.cml
13721370
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_aot_product_runner.cmx
1373-
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_aot_runner.cml
13741371
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_aot_runner.cmx
1375-
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_jit_product_runner.cml
13761372
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_jit_product_runner.cmx
1377-
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_jit_runner.cml
13781373
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_jit_runner.cmx
13791374
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/dart_zircon_test.cmx
13801375
FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/jit_product_runtime

shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.cc

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,10 @@ void Initialize(fidl::InterfaceHandle<fuchsia::sys::Environment> environment,
117117
dart_state->class_library().add_provider("fuchsia",
118118
std::move(fuchsia_class_provider));
119119

120-
// v2 components do not use the environment
121-
if (environment) {
122-
result = Dart_SetField(
123-
library, ToDart("_environment"),
124-
ToDart(zircon::dart::Handle::Create(environment.TakeChannel())));
125-
FML_CHECK(!tonic::LogIfError(result));
126-
}
120+
result = Dart_SetField(
121+
library, ToDart("_environment"),
122+
ToDart(zircon::dart::Handle::Create(environment.TakeChannel())));
123+
FML_CHECK(!tonic::LogIfError(result));
127124

128125
if (directory_request) {
129126
result = Dart_SetField(

shell/platform/fuchsia/dart_runner/BUILD.gn

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ template("runner") {
6969
"//flutter/fml",
7070
"//flutter/shell/platform/fuchsia/dart-pkg/fuchsia",
7171
"//flutter/shell/platform/fuchsia/dart-pkg/zircon",
72-
"$fuchsia_sdk_root/fidl:fuchsia.component.runner",
7372
"$fuchsia_sdk_root/pkg:async",
7473
"$fuchsia_sdk_root/pkg:async-cpp",
7574
"$fuchsia_sdk_root/pkg:async-default",
@@ -221,7 +220,6 @@ template("jit_runner_package") {
221220
binary = "dart_jit${product_suffix}_runner"
222221

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

226224
libraries = _common_runner_libs
227225

0 commit comments

Comments
 (0)