Revert "Enable shell_unittests on Fuchsia with Vulkan dependencies. (flutter#16376)"

This reverts commit 9d60825.

Author: NoamDev

BUILD.gn

@@ -136,7 +136,6 @@ if (is_fuchsia) {
       "//flutter/flow:flow_tests",
       "//flutter/fml:fml_tests",
       "//flutter/runtime:runtime_tests",
-      "//flutter/shell/common:shell_tests",
       "//flutter/shell/platform/fuchsia/flutter:flutter_runner_scenic_tests",
       "//flutter/shell/platform/fuchsia/flutter:flutter_runner_tests",
     ]

ci/licenses_golden/licenses_flutter

@@ -578,8 +578,6 @@ FILE: ../../../flutter/shell/common/shell_test_platform_view.cc
 FILE: ../../../flutter/shell/common/shell_test_platform_view.h
 FILE: ../../../flutter/shell/common/shell_test_platform_view_gl.cc
 FILE: ../../../flutter/shell/common/shell_test_platform_view_gl.h
-FILE: ../../../flutter/shell/common/shell_test_platform_view_vulkan.cc
-FILE: ../../../flutter/shell/common/shell_test_platform_view_vulkan.h
 FILE: ../../../flutter/shell/common/shell_unittests.cc
 FILE: ../../../flutter/shell/common/skia_event_tracer_impl.cc
 FILE: ../../../flutter/shell/common/skia_event_tracer_impl.h

shell/common/BUILD.gn

@@ -2,30 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//flutter/common/config.gni")
 import("//flutter/shell/gpu/gpu.gni")
 import("//flutter/testing/testing.gni")
 
-if (is_fuchsia) {
-  import("//build/fuchsia/sdk.gni")
-  import("//flutter/tools/fuchsia/fuchsia_archive.gni")
-}
-
-config("vulkan_config") {
-  if (using_fuchsia_sdk) {
-    include_dirs = [ "$fuchsia_sdk_root/vulkan/include" ]
-  } else if (is_fuchsia) {
-    include_dirs =
-        [ "//third_party/vulkan_loader_and_validation_layers/include" ]
-  } else {
-    include_dirs = [ "//third_party/vulkan/src" ]
-  }
-
-  if (is_fuchsia) {
-    defines = [ "VK_USE_PLATFORM_FUCHSIA=1" ]
-  }
-}
-
 # Template to generate a dart embedder resource.cc file.
 # Required invoker inputs:
 #   String output (name of output file)
@@ -164,19 +143,12 @@ template("shell_host_executable") {
   }
 }
 
-if (enable_unittests) {
-  declare_args() {
-    test_enable_vulkan = is_fuchsia
-    test_enable_gl = !is_fuchsia
-    test_enable_software = true
-    test_enable_metal = false
-  }
-
+if (current_toolchain == host_toolchain) {
   shell_gpu_configuration("shell_unittests_gpu_configuration") {
-    enable_software = test_enable_software
-    enable_vulkan = test_enable_vulkan
-    enable_gl = test_enable_gl
-    enable_metal = test_enable_metal
+    enable_software = true
+    enable_vulkan = false
+    enable_gl = true
+    enable_metal = false
   }
 
   test_fixtures("shell_unittests_fixtures") {
@@ -196,6 +168,8 @@ if (enable_unittests) {
       "shell_test.h",
       "shell_test_platform_view.cc",
       "shell_test_platform_view.h",
+      "shell_test_platform_view_gl.cc",
+      "shell_test_platform_view_gl.h",
       "shell_unittests.cc",
       "vsync_waiters_test.cc",
       "vsync_waiters_test.h",
@@ -210,64 +184,8 @@ if (enable_unittests) {
       "//flutter/lib/ui:ui",
       "//flutter/shell",
       "//flutter/testing:dart",
+      "//flutter/testing:opengl",
     ]
-
-    if (!defined(defines)) {
-      defines = []
-    }
-
-    # SwiftShader only supports x86/x64_64
-    if (target_cpu == "x86" || target_cpu == "x64") {
-      if (test_enable_gl) {
-        sources += [
-          "shell_test_platform_view_gl.cc",
-          "shell_test_platform_view_gl.h",
-        ]
-
-        deps += [ "//flutter/testing:opengl" ]
-
-        defines += [ "SHELL_ENABLE_GL" ]
-      }
-
-      if (test_enable_vulkan) {
-        sources += [
-          "shell_test_platform_view_vulkan.cc",
-          "shell_test_platform_view_vulkan.h",
-        ]
-
-        deps += [
-          "//flutter/testing:vulkan",
-          "//flutter/vulkan",
-        ]
-
-        defines += [ "SHELL_ENABLE_VULKAN" ]
-      }
-    }
-  }
-
-  if (is_fuchsia) {
-    fuchsia_test_archive("shell_tests") {
-      deps = [
-        ":shell_unittests",
-        ":shell_unittests_fixtures",
-      ]
-
-      binary = "shell_unittests"
-
-      # TODO(gw280): https://github.com/flutter/flutter/issues/50294
-      # Right now we need to manually specify all the fixtures that are
-      # declared in the test_fixtures() call above.
-      resources = [
-        {
-          path = "$target_gen_dir/assets/kernel_blob.bin"
-          dest = "assets/kernel_blob.bin"
-        },
-        {
-          path = "$target_gen_dir/assets/shelltest_screenshot.png"
-          dest = "assets/shelltest_screenshot.png"
-        },
-      ]
-    }
   }
 
   shell_host_executable("shell_benchmarks") {

shell/common/animator_unittests.cc

@@ -52,10 +52,9 @@ TEST_F(ShellTest, VSyncTargetTime) {
     shell = Shell::Create(
         task_runners, settings,
         [vsync_clock, &create_vsync_waiter](Shell& shell) {
-          return ShellTestPlatformView::Create(
-              shell, shell.GetTaskRunners(), vsync_clock,
-              std::move(create_vsync_waiter),
-              ShellTestPlatformView::BackendType::kDefaultBackend);
+          return ShellTestPlatformView::Create(shell, shell.GetTaskRunners(),
+                                               vsync_clock,
+                                               std::move(create_vsync_waiter));
         },
         [](Shell& shell) {
           return std::make_unique<Rasterizer>(shell, shell.GetTaskRunners());

shell/common/shell_test.cc

@@ -254,10 +254,9 @@ std::unique_ptr<Shell> ShellTest::CreateShell(Settings settings,
   return Shell::Create(
       task_runners, settings,
       [vsync_clock, &create_vsync_waiter](Shell& shell) {
-        return ShellTestPlatformView::Create(
-            shell, shell.GetTaskRunners(), vsync_clock,
-            std::move(create_vsync_waiter),
-            ShellTestPlatformView::BackendType::kDefaultBackend);
+        return ShellTestPlatformView::Create(shell, shell.GetTaskRunners(),
+                                             vsync_clock,
+                                             std::move(create_vsync_waiter));
       },
       [](Shell& shell) {
         return std::make_unique<Rasterizer>(shell, shell.GetTaskRunners());

shell/common/shell_test_platform_view.cc

@@ -3,13 +3,7 @@
 // found in the LICENSE file.
 
 #include "flutter/shell/common/shell_test_platform_view.h"
-
-#ifdef SHELL_ENABLE_GL
 #include "flutter/shell/common/shell_test_platform_view_gl.h"
-#endif  // SHELL_ENABLE_GL
-#ifdef SHELL_ENABLE_VULKAN
-#include "flutter/shell/common/shell_test_platform_view_vulkan.h"
-#endif  // SHELL_ENABLE_VULKAN
 
 namespace flutter {
 namespace testing {
@@ -18,26 +12,9 @@ std::unique_ptr<ShellTestPlatformView> ShellTestPlatformView::Create(
     PlatformView::Delegate& delegate,
     TaskRunners task_runners,
     std::shared_ptr<ShellTestVsyncClock> vsync_clock,
-    CreateVsyncWaiter create_vsync_waiter,
-    BackendType backend) {
-  // TODO(gw280): https://github.com/flutter/flutter/issues/50298
-  // Make this fully runtime configurable
-  switch (backend) {
-    case BackendType::kDefaultBackend:
-#ifdef SHELL_ENABLE_GL
-    case BackendType::kGLBackend:
-      return std::make_unique<ShellTestPlatformViewGL>(
-          delegate, task_runners, vsync_clock, create_vsync_waiter);
-#endif  // SHELL_ENABLE_GL
-#ifdef SHELL_ENABLE_VULKAN
-    case BackendType::kVulkanBackend:
-      return std::make_unique<ShellTestPlatformViewVulkan>(
-          delegate, task_runners, vsync_clock, create_vsync_waiter);
-#endif  // SHELL_ENABLE_VULKAN
-    default:
-      FML_LOG(FATAL) << "No backends supported for ShellTestPlatformView";
-      return nullptr;
-  }
+    CreateVsyncWaiter create_vsync_waiter) {
+  return std::make_unique<ShellTestPlatformViewGL>(
+      delegate, task_runners, vsync_clock, create_vsync_waiter);
 }
 
 }  // namespace testing

shell/common/shell_test_platform_view.h

@@ -13,18 +13,11 @@ namespace testing {
 
 class ShellTestPlatformView : public PlatformView {
  public:
-  enum class BackendType {
-    kGLBackend,
-    kVulkanBackend,
-    kDefaultBackend,
-  };
-
   static std::unique_ptr<ShellTestPlatformView> Create(
       PlatformView::Delegate& delegate,
       TaskRunners task_runners,
       std::shared_ptr<ShellTestVsyncClock> vsync_clock,
-      CreateVsyncWaiter create_vsync_waiter,
-      BackendType backend);
+      CreateVsyncWaiter create_vsync_waiter);
 
   virtual void SimulateVSync() = 0;
 

shell/common/shell_test_platform_view_vulkan.cc

@@ -135,8 +135,7 @@ TEST_F(ShellTest,
             [task_runners = shell.GetTaskRunners()]() {
               return static_cast<std::unique_ptr<VsyncWaiter>>(
                   std::make_unique<VsyncWaiterFallback>(task_runners));
-            },
-            ShellTestPlatformView::BackendType::kDefaultBackend);
+            });
       },
       [](Shell& shell) {
         return std::make_unique<Rasterizer>(shell, shell.GetTaskRunners());