commit 08949a3fe76547e05d34d6633b1a37aae42ae6ee
author Maksim Sisov <msisov@igalia.com> Fri Sep 10 06:08:41 2021 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Sep 10 06:08:41 2021 +0000
tree d33e3e1ef15fde3844e7752a8d7fdbbf8c83dd41
parent 6fa50b5e6c57a54f9ae1c260a1e9134b319f89a8

rename use_x11 to ozone_platform_x11

Ozone is default now in Chromium and non-Ozone/X11 (aka use_x11) is
deprecated. During the transition period use_x11 == ozone_platform_x11.

Bug: c/1096425
Change-Id: Iaec1bd171423936f5a1817fae08a72079faf16fc
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/63840
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Maksim Sisov <msisov@igalia.com>

build_overrides/vulkan_validation_layers.gni

diff --git a/build_overrides/vulkan_validation_layers.gni b/build_overrides/vulkan_validation_layers.gni
index 91f95b3..c0973ff 100644
--- a/build_overrides/vulkan_validation_layers.gni
+++ b/build_overrides/vulkan_validation_layers.gni
@@ -20,6 +20,6 @@
 vvl_spirv_tools_dir = "//third_party/vulkan-deps/spirv-tools/src"
 vvl_glslang_dir = "//third_party/vulkan-deps/glslang/src"
 
-# Fake the use_x11 when inside Dawn's repository
+# Fake the ozone_platform_x11 when inside Dawn's repository
 import("../scripts/dawn_features.gni")
 use_x11 = dawn_use_x11

scripts/dawn_features.gni

diff --git a/scripts/dawn_features.gni b/scripts/dawn_features.gni
index e136203..5a80f4d 100644
--- a/scripts/dawn_features.gni
+++ b/scripts/dawn_features.gni
@@ -16,9 +16,9 @@
 
 if (build_with_chromium) {
   import("//build/config/sanitizers/sanitizers.gni")
-  import("//build/config/ui.gni")
+  import("//build/config/ozone.gni")
 
-  dawn_use_x11 = use_x11
+  dawn_use_x11 = ozone_platform_x11
 } else {
   declare_args() {
     # Whether Dawn should enable X11 support.