[fuchsia] Remove Dart CF v1 runner. (flutter#36029)

ndusart · Sep 13, 2022 · 4342ce4 · 4342ce4
1 parent 3d7dc45
commit 4342ce4
Show file tree

Hide file tree

Showing 22 changed files with 220 additions and 1,046 deletions.
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
@@ -2111,12 +2111,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_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/dart_test_component_controller_v2.cc
-FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_test_component_controller_v2.h
+FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_test_component_controller.cc
+FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/dart_test_component_controller.h
 FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/builtin.dart
 FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/script_runner_snapshot.dart
 FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/shim.dart
@@ -2126,19 +2124,11 @@ FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/embedder/snapshot.h
 FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/kernel/libraries.json
 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/jit_product_runtime
-FILE: ../../../flutter/shell/platform/fuchsia/dart_runner/meta/jit_runtime
 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

diff --git a/shell/platform/fuchsia/dart_runner/BUILD.gn b/shell/platform/fuchsia/dart_runner/BUILD.gn
@@ -20,12 +20,10 @@ template("runner_sources") {
       "builtin_libraries.h",
       "dart_component_controller.cc",
       "dart_component_controller.h",
-      "dart_component_controller_v2.cc",
-      "dart_component_controller_v2.h",
       "dart_runner.cc",
       "dart_runner.h",
-      "dart_test_component_controller_v2.cc",
-      "dart_test_component_controller_v2.h",
+      "dart_test_component_controller.cc",
+      "dart_test_component_controller.h",
       "logging.h",
       "service_isolate.cc",
       "service_isolate.h",
@@ -179,7 +177,6 @@ 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_libs
@@ -240,7 +237,6 @@ 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_libs

diff --git a/shell/platform/fuchsia/dart_runner/README.md b/shell/platform/fuchsia/dart_runner/README.md
@@ -1,3 +1,4 @@
 # Dart Application Runner
 
-An Runner that runs Dart programs.
+Implements the `fuchsia::component::runner::ComponentRunner` FIDL interface to
+launch and run Dart applications that don't use Flutter.