Lacros: Fix Lacros builder gn args
Following args should be set explicitly per go/lacros-build:
ozone_platform="wayland"
ozone_platform_gbm=false
ozone_platform_drm=false
Bug: 1204746
Change-Id: Ifaa2583ae217a2ef37a92c1207acba8d724ec787
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2875406
Reviewed-by: Sven Zheng <svenzheng@chromium.org>
Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#879572}
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 9b65245..2b9f0b0 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -2822,7 +2822,7 @@
},
'amd64-lacros': {
- 'gn_args': 'use_ozone=true ozone_platform_wayland=true ozone_platform_x11=false target_os="chromeos" use_evdev_gestures=false use_vaapi=false use_gtk=false use_glib=false enable_linux_installer=false rtc_use_pipewire=false use_gio=false use_v8_context_snapshot=false use_custom_libcxx=false use_pulseaudio=false use_pangocairo=false chromeos_is_browser_only=true use_system_libsync=false cros_host_sysroot="//build/linux/debian_sid_amd64-sysroot" cros_v8_snapshot_sysroot="//build/linux/debian_sid_amd64-sysroot" use_custom_libcxx_for_host=true'
+ 'gn_args': 'use_ozone=true ozone_platform="wayland" ozone_platform_wayland=true ozone_platform_gbm=false ozone_platform_drm=false ozone_platform_x11=false target_os="chromeos" use_evdev_gestures=false use_vaapi=false use_gtk=false use_glib=false enable_linux_installer=false rtc_use_pipewire=false use_gio=false use_v8_context_snapshot=false use_custom_libcxx=false use_pulseaudio=false use_pangocairo=false chromeos_is_browser_only=true use_system_libsync=false cros_host_sysroot="//build/linux/debian_sid_amd64-sysroot" cros_v8_snapshot_sysroot="//build/linux/debian_sid_amd64-sysroot" use_custom_libcxx_for_host=true'
},
# We build Android with codecs on most bots to ensure maximum test
diff --git a/tools/mb/mb_config_expectations/chrome.json b/tools/mb/mb_config_expectations/chrome.json
index fc45870..adc85ee 100644
--- a/tools/mb/mb_config_expectations/chrome.json
+++ b/tools/mb/mb_config_expectations/chrome.json
@@ -208,6 +208,9 @@
"is_chrome_branded": true,
"is_chromeos_device": true,
"is_official_build": true,
+ "ozone_platform": "wayland",
+ "ozone_platform_drm": false,
+ "ozone_platform_gbm": false,
"ozone_platform_headless": true,
"ozone_platform_wayland": true,
"ozone_platform_x11": false,
diff --git a/tools/mb/mb_config_expectations/chromium.chromiumos.json b/tools/mb/mb_config_expectations/chromium.chromiumos.json
index 5d03486..c9833e0 100644
--- a/tools/mb/mb_config_expectations/chromium.chromiumos.json
+++ b/tools/mb/mb_config_expectations/chromium.chromiumos.json
@@ -47,6 +47,9 @@
"enable_linux_installer": false,
"is_chromeos_device": true,
"is_debug": true,
+ "ozone_platform": "wayland",
+ "ozone_platform_drm": false,
+ "ozone_platform_gbm": false,
"ozone_platform_headless": true,
"ozone_platform_wayland": true,
"ozone_platform_x11": false,
@@ -109,6 +112,9 @@
"cros_v8_snapshot_sysroot": "//build/linux/debian_sid_amd64-sysroot",
"enable_linux_installer": false,
"is_chromeos_device": true,
+ "ozone_platform": "wayland",
+ "ozone_platform_drm": false,
+ "ozone_platform_gbm": false,
"ozone_platform_headless": true,
"ozone_platform_wayland": true,
"ozone_platform_x11": false,
@@ -137,6 +143,9 @@
"cros_v8_snapshot_sysroot": "//build/linux/debian_sid_amd64-sysroot",
"enable_linux_installer": false,
"is_chromeos_device": true,
+ "ozone_platform": "wayland",
+ "ozone_platform_drm": false,
+ "ozone_platform_gbm": false,
"ozone_platform_headless": true,
"ozone_platform_wayland": true,
"ozone_platform_x11": false,
diff --git a/tools/mb/mb_config_expectations/chromium.fyi.json b/tools/mb/mb_config_expectations/chromium.fyi.json
index 58ebd2d..14ec20e 100644
--- a/tools/mb/mb_config_expectations/chromium.fyi.json
+++ b/tools/mb/mb_config_expectations/chromium.fyi.json
@@ -642,6 +642,9 @@
"cros_v8_snapshot_sysroot": "//build/linux/debian_sid_amd64-sysroot",
"enable_linux_installer": false,
"is_chromeos_device": true,
+ "ozone_platform": "wayland",
+ "ozone_platform_drm": false,
+ "ozone_platform_gbm": false,
"ozone_platform_headless": true,
"ozone_platform_wayland": true,
"ozone_platform_x11": false,
diff --git a/tools/mb/mb_config_expectations/chromium.perf.json b/tools/mb/mb_config_expectations/chromium.perf.json
index 9edfe14..1216bcf 100644
--- a/tools/mb/mb_config_expectations/chromium.perf.json
+++ b/tools/mb/mb_config_expectations/chromium.perf.json
@@ -77,6 +77,9 @@
"is_chrome_branded": true,
"is_chromeos_device": true,
"is_official_build": true,
+ "ozone_platform": "wayland",
+ "ozone_platform_drm": false,
+ "ozone_platform_gbm": false,
"ozone_platform_headless": true,
"ozone_platform_wayland": true,
"ozone_platform_x11": false,
diff --git a/tools/mb/mb_config_expectations/internal.chrome.fyi.json b/tools/mb/mb_config_expectations/internal.chrome.fyi.json
index fc5a748..0ade047 100644
--- a/tools/mb/mb_config_expectations/internal.chrome.fyi.json
+++ b/tools/mb/mb_config_expectations/internal.chrome.fyi.json
@@ -7,6 +7,9 @@
"cros_v8_snapshot_sysroot": "//build/linux/debian_sid_amd64-sysroot",
"enable_linux_installer": false,
"is_chromeos_device": true,
+ "ozone_platform": "wayland",
+ "ozone_platform_drm": false,
+ "ozone_platform_gbm": false,
"ozone_platform_headless": true,
"ozone_platform_wayland": true,
"ozone_platform_x11": false,
diff --git a/tools/mb/mb_config_expectations/internal.chromeos.fyi.json b/tools/mb/mb_config_expectations/internal.chromeos.fyi.json
index 44dcb30e..5ccd211 100644
--- a/tools/mb/mb_config_expectations/internal.chromeos.fyi.json
+++ b/tools/mb/mb_config_expectations/internal.chromeos.fyi.json
@@ -46,6 +46,9 @@
"is_chrome_branded": true,
"is_chromeos_device": true,
"is_official_build": true,
+ "ozone_platform": "wayland",
+ "ozone_platform_drm": false,
+ "ozone_platform_gbm": false,
"ozone_platform_headless": true,
"ozone_platform_wayland": true,
"ozone_platform_x11": false,
diff --git a/tools/mb/mb_config_expectations/official.chrome.continuous.json b/tools/mb/mb_config_expectations/official.chrome.continuous.json
index 5e9ade0..5d060cc 100644
--- a/tools/mb/mb_config_expectations/official.chrome.continuous.json
+++ b/tools/mb/mb_config_expectations/official.chrome.continuous.json
@@ -10,6 +10,9 @@
"is_chrome_branded": true,
"is_chromeos_device": true,
"is_official_build": true,
+ "ozone_platform": "wayland",
+ "ozone_platform_drm": false,
+ "ozone_platform_gbm": false,
"ozone_platform_headless": true,
"ozone_platform_wayland": true,
"ozone_platform_x11": false,
diff --git a/tools/mb/mb_config_expectations/official.chrome.json b/tools/mb/mb_config_expectations/official.chrome.json
index 460d39f..749e3c3 100644
--- a/tools/mb/mb_config_expectations/official.chrome.json
+++ b/tools/mb/mb_config_expectations/official.chrome.json
@@ -28,6 +28,9 @@
"is_chrome_branded": true,
"is_chromeos_device": true,
"is_official_build": true,
+ "ozone_platform": "wayland",
+ "ozone_platform_drm": false,
+ "ozone_platform_gbm": false,
"ozone_platform_headless": true,
"ozone_platform_wayland": true,
"ozone_platform_x11": false,
diff --git a/tools/mb/mb_config_expectations/tryserver.chrome.json b/tools/mb/mb_config_expectations/tryserver.chrome.json
index 1370112..912195e 100644
--- a/tools/mb/mb_config_expectations/tryserver.chrome.json
+++ b/tools/mb/mb_config_expectations/tryserver.chrome.json
@@ -130,6 +130,9 @@
"is_chrome_branded": true,
"is_chromeos_device": true,
"is_official_build": true,
+ "ozone_platform": "wayland",
+ "ozone_platform_drm": false,
+ "ozone_platform_gbm": false,
"ozone_platform_headless": true,
"ozone_platform_wayland": true,
"ozone_platform_x11": false,
diff --git a/tools/mb/mb_config_expectations/tryserver.chromium.chromiumos.json b/tools/mb/mb_config_expectations/tryserver.chromium.chromiumos.json
index 577ff57..0c0dd95 100644
--- a/tools/mb/mb_config_expectations/tryserver.chromium.chromiumos.json
+++ b/tools/mb/mb_config_expectations/tryserver.chromium.chromiumos.json
@@ -117,6 +117,9 @@
"cros_v8_snapshot_sysroot": "//build/linux/debian_sid_amd64-sysroot",
"enable_linux_installer": false,
"is_chromeos_device": true,
+ "ozone_platform": "wayland",
+ "ozone_platform_drm": false,
+ "ozone_platform_gbm": false,
"ozone_platform_headless": true,
"ozone_platform_wayland": true,
"ozone_platform_x11": false,
diff --git a/tools/mb/mb_config_expectations/tryserver.chromium.perf.json b/tools/mb/mb_config_expectations/tryserver.chromium.perf.json
index 3afb836..6df9a54 100644
--- a/tools/mb/mb_config_expectations/tryserver.chromium.perf.json
+++ b/tools/mb/mb_config_expectations/tryserver.chromium.perf.json
@@ -39,6 +39,9 @@
"is_chrome_branded": true,
"is_chromeos_device": true,
"is_official_build": true,
+ "ozone_platform": "wayland",
+ "ozone_platform_drm": false,
+ "ozone_platform_gbm": false,
"ozone_platform_headless": true,
"ozone_platform_wayland": true,
"ozone_platform_x11": false,
