Commit af5e3822 by Jamie Madill Committed by Commit Bot

Fix overlay build.

The overlay define was placed in the libANGLE target instead of in the config. This was causing a compile error in the capture-enabled build. Bug: None Change-Id: I9df02faaf57683119ca49a9b44e41ff049b05556 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2023479Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent e3906550
...@@ -577,6 +577,10 @@ config("libANGLE_config") { ...@@ -577,6 +577,10 @@ config("libANGLE_config") {
if (angle_use_x11) { if (angle_use_x11) {
defines += [ "ANGLE_USE_X11" ] defines += [ "ANGLE_USE_X11" ]
} }
if (angle_enable_overlay) {
defines += [ "ANGLE_ENABLE_OVERLAY=1" ]
}
} }
angle_source_set("libANGLE_headers") { angle_source_set("libANGLE_headers") {
...@@ -585,6 +589,7 @@ angle_source_set("libANGLE_headers") { ...@@ -585,6 +589,7 @@ angle_source_set("libANGLE_headers") {
":angle_common", ":angle_common",
":angle_translator_headers", ":angle_translator_headers",
] ]
public_configs += [ ":libANGLE_config" ]
} }
# Don't even try to build glslang if Metal and Vulkan are disabled. # Don't even try to build glslang if Metal and Vulkan are disabled.
...@@ -728,10 +733,6 @@ angle_source_set("libANGLE_base") { ...@@ -728,10 +733,6 @@ angle_source_set("libANGLE_base") {
defines += [ "ANGLE_GENERATE_SHADER_DEBUG_INFO" ] defines += [ "ANGLE_GENERATE_SHADER_DEBUG_INFO" ]
} }
if (angle_enable_overlay) {
defines += [ "ANGLE_ENABLE_OVERLAY=1" ]
}
configs += [ ":debug_annotations_config" ] configs += [ ":debug_annotations_config" ]
public_configs += [ public_configs += [
":libANGLE_config", ":libANGLE_config",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment