Merge pull request #1375 from chrisdimich/master

chromium-ozone-wayland: add bbappend and patches as per NXP 5.15.71_2…

1 files changed, 34 insertions, 0 deletions

diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland/0002-chromium-met-EGL-API-GetProcAddress-failures.patch b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland/0002-chromium-met-EGL-API-GetProcAddress-failures.patch
new file mode 100644
index 000000000..b85e3cfd9
--- /dev/null
+++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland/0002-chromium-met-EGL-API-GetProcAddress-failures.patch
@@ -0,0 +1,34 @@
+From fc83501ff2105f99183b3f6ea240d6baacf3ea05 Mon Sep 17 00:00:00 2001
+From: Wujian Sun <wujian.sun_1@nxp.com>
+Date: Wed, 10 Nov 2021 17:28:22 +0800
+Subject: [PATCH] chromium met EGL API GetProcAddress failures
+
+Wayland not use SwANGLE as below commit, so no need
+build SwANGLE on wayland platform.
+
+commit 97f919dd8b544b583b772664f0d7b8e6b6d8da2e
+Reland "Use SwANGLE on all Ozone platforms, except Wayland"
+
+Upstream-Status: Inappropriate [i.MX-specific]
+
+Signed-off-by: Wujian Sun <wujian.sun_1@nxp.com>
+---
+ ui/gl/BUILD.gn | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ui/gl/BUILD.gn b/ui/gl/BUILD.gn
+index bb7d843c1f363..4b4b360758e1d 100644
+--- a/ui/gl/BUILD.gn
++++ b/ui/gl/BUILD.gn
+@@ -252,7 +252,7 @@ component("gl") {
+ 
+   if (use_ozone) {
+     deps += [ "//ui/ozone:buildflags" ]
+-    if (use_egl && !is_fuchsia) {
++    if (use_egl && !is_fuchsia && !ozone_platform_wayland) {
+       data_deps += [
+         "//third_party/angle:libEGL",
+         "//third_party/angle:libGLESv2",
+-- 
+2.17.1
+