Skip to content

Commit ea420db

Browse files
author
George Wright
authored
Use the gpu config for shell_unittests to declare SHELL_ENABLE_{GL,VULKAN} (flutter#21603)
1 parent 042c7f0 commit ea420db

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

shell/common/BUILD.gn

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,6 @@ template("shell_host_executable") {
144144
}
145145

146146
if (enable_unittests) {
147-
config("test_enable_gl_config") {
148-
defines = [ "SHELL_ENABLE_GL" ]
149-
}
150-
151-
config("test_enable_vulkan_config") {
152-
defines = [ "SHELL_ENABLE_VULKAN" ]
153-
}
154-
155147
shell_gpu_configuration("shell_unittests_gpu_configuration") {
156148
enable_software = test_enable_software
157149
enable_vulkan = test_enable_vulkan
@@ -217,7 +209,10 @@ if (enable_unittests) {
217209
"//third_party/skia",
218210
]
219211

220-
public_configs = [ ":shell_test_fixture_sources_config" ]
212+
public_configs = [
213+
":shell_test_fixture_sources_config",
214+
":shell_unittests_gpu_configuration_config",
215+
]
221216

222217
# SwiftShader only supports x86/x64_64
223218
if (target_cpu == "x86" || target_cpu == "x64") {
@@ -227,8 +222,6 @@ if (enable_unittests) {
227222
"shell_test_platform_view_gl.h",
228223
]
229224

230-
public_configs += [ ":test_enable_gl_config" ]
231-
232225
public_deps += [ "//flutter/testing:opengl" ]
233226
}
234227
}
@@ -239,8 +232,6 @@ if (enable_unittests) {
239232
"shell_test_platform_view_vulkan.h",
240233
]
241234

242-
public_configs += [ ":test_enable_vulkan_config" ]
243-
244235
public_deps += [ "//flutter/vulkan" ]
245236
}
246237
}

0 commit comments

Comments
 (0)