Move the Fuchsia Flutter Runner to //flutter/shell/platform/fuchsia/flutter (#8939)

This makes room for the Dart runner at //flutter/shell/platform/fuchsia/dart.

BUILD.gn

@@ -29,7 +29,7 @@ group("flutter") {
   }
 
   if (is_fuchsia && using_fuchsia_sdk) {
-    public_deps += [ "$flutter_root/shell/platform/fuchsia" ]
+    public_deps += [ "$flutter_root/shell/platform/fuchsia/flutter" ]
   }
 
   if (!is_fuchsia && !is_fuchsia_host) {

ci/licenses_golden/licenses_flutter

@@ -768,13 +768,6 @@ FILE: ../../../flutter/shell/platform/embedder/platform_view_embedder.cc
 FILE: ../../../flutter/shell/platform/embedder/platform_view_embedder.h
 FILE: ../../../flutter/shell/platform/embedder/vsync_waiter_embedder.cc
 FILE: ../../../flutter/shell/platform/embedder/vsync_waiter_embedder.h
-FILE: ../../../flutter/shell/platform/fuchsia/collect_traces.dart
-FILE: ../../../flutter/shell/platform/fuchsia/component.cc
-FILE: ../../../flutter/shell/platform/fuchsia/component.h
-FILE: ../../../flutter/shell/platform/fuchsia/compositor_context.cc
-FILE: ../../../flutter/shell/platform/fuchsia/compositor_context.h
-FILE: ../../../flutter/shell/platform/fuchsia/context_writer_bridge.cc
-FILE: ../../../flutter/shell/platform/fuchsia/context_writer_bridge.h
 FILE: ../../../flutter/shell/platform/fuchsia/dart-pkg/fuchsia/lib/fuchsia.dart
 FILE: ../../../flutter/shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.cc
 FILE: ../../../flutter/shell/platform/fuchsia/dart-pkg/fuchsia/sdk_ext/fuchsia.h
@@ -790,35 +783,65 @@ FILE: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/natives.cc
 FILE: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/natives.h
 FILE: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/system.cc
 FILE: ../../../flutter/shell/platform/fuchsia/dart-pkg/zircon/sdk_ext/system.h
-FILE: ../../../flutter/shell/platform/fuchsia/engine.cc
-FILE: ../../../flutter/shell/platform/fuchsia/engine.h
-FILE: ../../../flutter/shell/platform/fuchsia/fuchsia_font_manager.cc
-FILE: ../../../flutter/shell/platform/fuchsia/fuchsia_font_manager.h
-FILE: ../../../flutter/shell/platform/fuchsia/fuchsia_font_manager_unittest.cc
-FILE: ../../../flutter/shell/platform/fuchsia/isolate_configurator.cc
-FILE: ../../../flutter/shell/platform/fuchsia/isolate_configurator.h
-FILE: ../../../flutter/shell/platform/fuchsia/kernel/extract_far.dart
-FILE: ../../../flutter/shell/platform/fuchsia/kernel/framework_shim.dart
-FILE: ../../../flutter/shell/platform/fuchsia/kernel/libraries.json
-FILE: ../../../flutter/shell/platform/fuchsia/logging.h
-FILE: ../../../flutter/shell/platform/fuchsia/loop.cc
-FILE: ../../../flutter/shell/platform/fuchsia/loop.h
-FILE: ../../../flutter/shell/platform/fuchsia/main.cc
-FILE: ../../../flutter/shell/platform/fuchsia/meta/aot_product_runtime
-FILE: ../../../flutter/shell/platform/fuchsia/meta/aot_runtime
-FILE: ../../../flutter/shell/platform/fuchsia/meta/flutter_aot_product_runner.cmx
-FILE: ../../../flutter/shell/platform/fuchsia/meta/flutter_aot_runner.cmx
-FILE: ../../../flutter/shell/platform/fuchsia/meta/flutter_jit_product_runner.cmx
-FILE: ../../../flutter/shell/platform/fuchsia/meta/flutter_jit_runner.cmx
-FILE: ../../../flutter/shell/platform/fuchsia/meta/flutter_runner_tests.cmx
-FILE: ../../../flutter/shell/platform/fuchsia/meta/jit_product_runtime
-FILE: ../../../flutter/shell/platform/fuchsia/meta/jit_runtime
-FILE: ../../../flutter/shell/platform/fuchsia/platform_view.cc
-FILE: ../../../flutter/shell/platform/fuchsia/platform_view.h
-FILE: ../../../flutter/shell/platform/fuchsia/runner.cc
-FILE: ../../../flutter/shell/platform/fuchsia/runner.h
-FILE: ../../../flutter/shell/platform/fuchsia/runner_context.cc
-FILE: ../../../flutter/shell/platform/fuchsia/runner_context.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/collect_traces.dart
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/component.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/component.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/compositor_context.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/compositor_context.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/context_writer_bridge.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/context_writer_bridge.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/engine.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/engine.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_font_manager.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_font_manager.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/fuchsia_font_manager_unittest.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/isolate_configurator.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/isolate_configurator.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/kernel/extract_far.dart
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/kernel/framework_shim.dart
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/kernel/libraries.json
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/logging.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/loop.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/loop.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/main.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/aot_product_runtime
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/aot_runtime
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_product_runner.cmx
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_aot_runner.cmx
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_product_runner.cmx
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_jit_runner.cmx
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/flutter_runner_tests.cmx
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/jit_product_runtime
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/meta/jit_runtime
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/platform_view.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/platform_view.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner_context.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/runner_context.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/service_provider_dir.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/service_provider_dir.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/session_connection.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/session_connection.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/surface.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/surface.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/task_observers.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/task_observers.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/task_runner_adapter.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/task_runner_adapter.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/thread.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/thread.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/unique_fdio_ns.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/vsync_recorder.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/vsync_recorder.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/vsync_waiter.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/vsync_waiter.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/vulkan_surface.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/vulkan_surface.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/vulkan_surface_pool.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/vulkan_surface_pool.h
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/vulkan_surface_producer.cc
+FILE: ../../../flutter/shell/platform/fuchsia/flutter/vulkan_surface_producer.h
 FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/files.cc
 FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/files.h
 FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/handle_exception.cc
@@ -831,29 +854,6 @@ FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/vmo.cc
 FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/vmo.h
 FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.cc
 FILE: ../../../flutter/shell/platform/fuchsia/runtime/dart/utils/vmservice_object.h
-FILE: ../../../flutter/shell/platform/fuchsia/service_provider_dir.cc
-FILE: ../../../flutter/shell/platform/fuchsia/service_provider_dir.h
-FILE: ../../../flutter/shell/platform/fuchsia/session_connection.cc
-FILE: ../../../flutter/shell/platform/fuchsia/session_connection.h
-FILE: ../../../flutter/shell/platform/fuchsia/surface.cc
-FILE: ../../../flutter/shell/platform/fuchsia/surface.h
-FILE: ../../../flutter/shell/platform/fuchsia/task_observers.cc
-FILE: ../../../flutter/shell/platform/fuchsia/task_observers.h
-FILE: ../../../flutter/shell/platform/fuchsia/task_runner_adapter.cc
-FILE: ../../../flutter/shell/platform/fuchsia/task_runner_adapter.h
-FILE: ../../../flutter/shell/platform/fuchsia/thread.cc
-FILE: ../../../flutter/shell/platform/fuchsia/thread.h
-FILE: ../../../flutter/shell/platform/fuchsia/unique_fdio_ns.h
-FILE: ../../../flutter/shell/platform/fuchsia/vsync_recorder.cc
-FILE: ../../../flutter/shell/platform/fuchsia/vsync_recorder.h
-FILE: ../../../flutter/shell/platform/fuchsia/vsync_waiter.cc
-FILE: ../../../flutter/shell/platform/fuchsia/vsync_waiter.h
-FILE: ../../../flutter/shell/platform/fuchsia/vulkan_surface.cc
-FILE: ../../../flutter/shell/platform/fuchsia/vulkan_surface.h
-FILE: ../../../flutter/shell/platform/fuchsia/vulkan_surface_pool.cc
-FILE: ../../../flutter/shell/platform/fuchsia/vulkan_surface_pool.h
-FILE: ../../../flutter/shell/platform/fuchsia/vulkan_surface_producer.cc
-FILE: ../../../flutter/shell/platform/fuchsia/vulkan_surface_producer.h
 FILE: ../../../flutter/shell/platform/glfw/client_wrapper/flutter_window_controller.cc
 FILE: ../../../flutter/shell/platform/glfw/client_wrapper/flutter_window_controller_unittests.cc
 FILE: ../../../flutter/shell/platform/glfw/client_wrapper/include/flutter/flutter_window.h

shell/platform/BUILD.gn

@@ -30,7 +30,7 @@ group("platform") {
     # Fuchsia has its own runner implementation.
     if (using_fuchsia_sdk) {
       deps = [
-        "fuchsia",
+        "fuchsia/flutter",
       ]
     }
   } else {

shell/platform/fuchsia/BUILD.gn → shell/platform/fuchsia/flutter/BUILD.gn

@@ -7,7 +7,7 @@ assert(is_fuchsia)
 import("//build/fuchsia/sdk.gni")
 
 if (using_fuchsia_sdk) {
-  executable("fuchsia") {
+  executable("flutter") {
     output_name = "four_gate"
 
     sources = [
@@ -66,6 +66,9 @@ if (using_fuchsia_sdk) {
       "$flutter_root/runtime",
       "$flutter_root/runtime:libdart",
       "$flutter_root/shell/common",
+      "$flutter_root/shell/platform/fuchsia/dart-pkg/fuchsia",
+      "$flutter_root/shell/platform/fuchsia/dart-pkg/zircon",
+      "$flutter_root/shell/platform/fuchsia/runtime/dart/utils",
       "$flutter_root/vulkan",
       "$fuchsia_sdk_root/fidl:fuchsia.fonts",
       "$fuchsia_sdk_root/fidl:fuchsia.images",
@@ -84,9 +87,6 @@ if (using_fuchsia_sdk) {
       "$fuchsia_sdk_root/pkg:zx",
       "$fuchsia_sdk_root/pkg/lib/sys/cpp",
       "$fuchsia_sdk_root/pkg/lib/vfs/cpp",
-      "dart-pkg/fuchsia",
-      "dart-pkg/zircon",
-      "runtime/dart/utils",
       "//third_party/tonic",
     ]
   }