From 1dc8bf6426fe39088a018b034be54216ae1bd847 Mon Sep 17 00:00:00 2001
From: George Wright <gw280@google.com>
Date: Mon, 5 Oct 2020 12:21:52 -0700
Subject: [PATCH] Use the gpu config for shell_unittests to declare
 SHELL_ENABLE_{GL,VULKAN}

---
 shell/common/BUILD.gn | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/shell/common/BUILD.gn b/shell/common/BUILD.gn
index b2f7cab87029d..eff5742eebee8 100644
--- a/shell/common/BUILD.gn
+++ b/shell/common/BUILD.gn
@@ -144,14 +144,6 @@ template("shell_host_executable") {
 }
 
 if (enable_unittests) {
-  config("test_enable_gl_config") {
-    defines = [ "SHELL_ENABLE_GL" ]
-  }
-
-  config("test_enable_vulkan_config") {
-    defines = [ "SHELL_ENABLE_VULKAN" ]
-  }
-
   shell_gpu_configuration("shell_unittests_gpu_configuration") {
     enable_software = test_enable_software
     enable_vulkan = test_enable_vulkan
@@ -217,7 +209,10 @@ if (enable_unittests) {
       "//third_party/skia",
     ]
 
-    public_configs = [ ":shell_test_fixture_sources_config" ]
+    public_configs = [
+      ":shell_test_fixture_sources_config",
+      ":shell_unittests_gpu_configuration_config",
+    ]
 
     # SwiftShader only supports x86/x64_64
     if (target_cpu == "x86" || target_cpu == "x64") {
@@ -227,8 +222,6 @@ if (enable_unittests) {
           "shell_test_platform_view_gl.h",
         ]
 
-        public_configs += [ ":test_enable_gl_config" ]
-
         public_deps += [ "//flutter/testing:opengl" ]
       }
     }
@@ -239,8 +232,6 @@ if (enable_unittests) {
         "shell_test_platform_view_vulkan.h",
       ]
 
-      public_configs += [ ":test_enable_vulkan_config" ]
-
       public_deps += [ "//flutter/vulkan" ]
     }
   }