mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 05:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename use_x11 to ozone_platform_x11

Browse source 
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: chromium:1096425
Change-Id: Ie3643360ec6607796533054bdedf8e2bb8e7e749
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/231650
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35040}
This commit is contained in:
Maksim Sisov 2021-09-20 09:02:01 +03:00 committed by WebRTC LUCI CQ
parent afc237751a
commit ef4d0b6c7a
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS
View file

@ -70,6 +70,7 @@ Mallikarjuna Rao V <vm.arjun@samsung.com>
Manish Jethani <manish.jethani@gmail.com> Manish Jethani <manish.jethani@gmail.com>
Martin Storsjo <martin@martin.st> Martin Storsjo <martin@martin.st>
Matthias Liebig <matthias.gcode@gmail.com> Matthias Liebig <matthias.gcode@gmail.com>
Maksim Sisov <msisov@igalia.com>
Maxim Pavlov <pavllovmax@gmail.com> Maxim Pavlov <pavllovmax@gmail.com>
Maxim Potapov <vopatop.skam@gmail.com> Maxim Potapov <vopatop.skam@gmail.com>
Michael Iedema <michael@kapsulate.com> Michael Iedema <michael@kapsulate.com>

5
tools_webrtc/mb/mb.py
View file

@ -911,9 +911,8 @@ class MetaBuildWrapper(object):
cmdline.append('../../tools_webrtc/ensure_webcam_is_running.py') cmdline.append('../../tools_webrtc/ensure_webcam_is_running.py')
extra_files.append('../../tools_webrtc/ensure_webcam_is_running.py') extra_files.append('../../tools_webrtc/ensure_webcam_is_running.py')
# This needs to mirror the settings in //build/config/ui.gni: # is_linux uses use_ozone and x11 by default.
# use_x11 = is_linux && !use_ozone. use_x11 = is_linux
use_x11 = is_linux and not 'use_ozone=true' in vals['gn_args']
xvfb = use_x11 and test_type == 'windowed_test_launcher' xvfb = use_x11 and test_type == 'windowed_test_launcher'
if xvfb: if xvfb:

4
webrtc.gni
View file

@ -8,9 +8,9 @@
import("//build/config/arm.gni") import("//build/config/arm.gni")
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/config/mips.gni") import("//build/config/mips.gni")
import("//build/config/ozone.gni")
import("//build/config/sanitizers/sanitizers.gni") import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/sysroot.gni") import("//build/config/sysroot.gni")
import("//build/config/ui.gni")
import("//build_overrides/build.gni") import("//build_overrides/build.gni")
if (!build_with_chromium && is_component_build) { if (!build_with_chromium && is_component_build) {
@ -124,7 +124,7 @@ declare_args() {
rtc_build_tools = true rtc_build_tools = true
# Set this to false to skip building code that requires X11. # Set this to false to skip building code that requires X11.
rtc_use_x11 = use_x11 rtc_use_x11 = ozone_platform_x11
# Set this to use PipeWire on the Wayland display server. # Set this to use PipeWire on the Wayland display server.
# By default it's only enabled on desktop Linux (excludes ChromeOS) and # By default it's only enabled on desktop Linux (excludes ChromeOS) and