Fix build flags not in declare_args when angle_has_build is true

Required so that these can be overridden in .gn files. Will allow us to
fix roll of ANGLE into Dawn.

Bug: angleproject:6902
Change-Id: I8636778969ae489fdc7420414957d43fcfb634a8
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3627120
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
This commit is contained in:
Antonio Maiorano
2022-05-04 09:54:30 -04:00
committed by Angle LUCI CQ
parent 14c483f1c4
commit b72cff8c0a

View File

@@ -39,10 +39,12 @@ if (angle_has_build) {
angle_vulkan_display_mode = "headless"
}
angle_use_x11 = ozone_platform_x11 && !is_ggp && is_linux && !is_chromecast
angle_use_wayland =
ozone_platform_wayland && !is_ggp && is_linux && !is_chromecast
angle_use_vulkan_display = (is_linux || is_chromeos) && !is_ggp
declare_args() {
angle_use_x11 = ozone_platform_x11 && !is_ggp && is_linux && !is_chromecast
angle_use_wayland =
ozone_platform_wayland && !is_ggp && is_linux && !is_chromecast
angle_use_vulkan_display = (is_linux || is_chromeos) && !is_ggp
}
} else {
declare_args() {
is_ubsan = false