From 08949a3fe76547e05d34d6633b1a37aae42ae6ee Mon Sep 17 00:00:00 2001 From: Maksim Sisov Date: Fri, 10 Sep 2021 06:08:41 +0000 Subject: [PATCH] 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 Commit-Queue: Maksim Sisov --- build_overrides/vulkan_validation_layers.gni | 2 +- scripts/dawn_features.gni | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_overrides/vulkan_validation_layers.gni b/build_overrides/vulkan_validation_layers.gni index 91f95b3d6c..c0973ff49b 100644 --- a/build_overrides/vulkan_validation_layers.gni +++ b/build_overrides/vulkan_validation_layers.gni @@ -20,6 +20,6 @@ import("//build_overrides/vulkan_common.gni") 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 diff --git a/scripts/dawn_features.gni b/scripts/dawn_features.gni index e136203328..5a80f4d392 100644 --- a/scripts/dawn_features.gni +++ b/scripts/dawn_features.gni @@ -16,9 +16,9 @@ import("//build_overrides/build.gni") 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.