From 195ef3d0f16f8ad384793b0aec7ea439d0288c68 Mon Sep 17 00:00:00 2001 From: Loic Sharma Date: Fri, 20 Jan 2023 10:46:27 -0800 Subject: [PATCH 1/2] Update build configs --- build/config/BUILDCONFIG.gn | 11 +++++++++-- build_overrides/wayland.gni | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn index b8d0f47b75..24a439067e 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -297,8 +297,15 @@ is_castos = false is_chromecast = false is_chromeos_lacros = false ozone_platform_headless = false -ozone_platform_x11 = false -ozone_platform_wayland = false + +# Needed for //third_party/swiftshader and //third_party/angle. +if (is_linux) { + ozone_platform_x11 = true + ozone_platform_wayland = true +} else { + ozone_platform_x11 = false + ozone_platform_wayland = false +} default_library_type = "static_library" diff --git a/build_overrides/wayland.gni b/build_overrides/wayland.gni index ffcfde96a2..2f4f1890c9 100644 --- a/build_overrides/wayland.gni +++ b/build_overrides/wayland.gni @@ -3,3 +3,6 @@ # found in the LICENSE file. # ANGLE expects this to be here. + +# Flutter has no wayland third-party dir +wayland_gn_dir = "" \ No newline at end of file From 54176894a2563fd25d6b5c3ad91fb07a4a7ad03e Mon Sep 17 00:00:00 2001 From: Loic Sharma Date: Fri, 20 Jan 2023 10:47:32 -0800 Subject: [PATCH 2/2] Format --- build_overrides/wayland.gni | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_overrides/wayland.gni b/build_overrides/wayland.gni index 2f4f1890c9..d3d82c33c8 100644 --- a/build_overrides/wayland.gni +++ b/build_overrides/wayland.gni @@ -5,4 +5,4 @@ # ANGLE expects this to be here. # Flutter has no wayland third-party dir -wayland_gn_dir = "" \ No newline at end of file +wayland_gn_dir = ""