diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
| commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
| tree | eff41dc61d9f714852212739e6b3738b82a2af87 /third_party/libwebrtc/tools_webrtc | |
| parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
| download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'third_party/libwebrtc/tools_webrtc')
| -rw-r--r-- | third_party/libwebrtc/tools_webrtc/OWNERS | 1 | ||||
| -rwxr-xr-x | third_party/libwebrtc/tools_webrtc/libs/generate_licenses.py | 2 | ||||
| -rw-r--r-- | third_party/libwebrtc/tools_webrtc/mb/mb_config.pyl | 14 |
3 files changed, 15 insertions, 2 deletions
diff --git a/third_party/libwebrtc/tools_webrtc/OWNERS b/third_party/libwebrtc/tools_webrtc/OWNERS index f73dc520b8..90ac9c9cc2 100644 --- a/third_party/libwebrtc/tools_webrtc/OWNERS +++ b/third_party/libwebrtc/tools_webrtc/OWNERS @@ -1,5 +1,4 @@ mbonadei@webrtc.org jansson@webrtc.org terelius@webrtc.org -landrey@webrtc.org jleconte@webrtc.org diff --git a/third_party/libwebrtc/tools_webrtc/libs/generate_licenses.py b/third_party/libwebrtc/tools_webrtc/libs/generate_licenses.py index fdc40f5c4c..feff4281f7 100755 --- a/third_party/libwebrtc/tools_webrtc/libs/generate_licenses.py +++ b/third_party/libwebrtc/tools_webrtc/libs/generate_licenses.py @@ -77,7 +77,7 @@ LIB_TO_LICENSES_DICT = { 'ooura': ['common_audio/third_party/ooura/LICENSE'], 'spl_sqrt_floor': ['common_audio/third_party/spl_sqrt_floor/LICENSE'], 'kotlin_stdlib': ['third_party/kotlin_stdlib/LICENSE'], - + 'jni_zero': ['third_party/jni_zero/LICENSE'], # TODO(bugs.webrtc.org/1110): Remove this hack. This is not a lib. # For some reason it is listed as so in _GetThirdPartyLibraries. 'android_deps': [], diff --git a/third_party/libwebrtc/tools_webrtc/mb/mb_config.pyl b/third_party/libwebrtc/tools_webrtc/mb/mb_config.pyl index c0f5130ff0..8862950e0e 100644 --- a/third_party/libwebrtc/tools_webrtc/mb/mb_config.pyl +++ b/third_party/libwebrtc/tools_webrtc/mb/mb_config.pyl @@ -146,6 +146,7 @@ 'dummy_audio_file_devices_no_protobuf': 'dummy_audio_file_devices_no_protobuf_android_arm', 'rtti_no_sctp': 'rtti_no_sctp_android_arm', + 'disable_trace_events': 'disable_trace_events_android_arm', }, 'android_arm_rel': 'android_release_bot_arm', 'android_compile_arm64_dbg': 'android_debug_static_bot_arm64', @@ -183,6 +184,7 @@ 'dummy_audio_file_devices_no_protobuf': 'dummy_audio_file_devices_no_protobuf_x64', 'rtti_no_sctp': 'rtti_no_sctp_x64', + 'disable_trace_events': 'disable_trace_events_x64', }, 'linux_msan': 'msan_clang_release_bot_x64', 'linux_rel': 'release_bot_x64', @@ -202,6 +204,8 @@ 'mac_rel_m1': 'release_bot_arm64', # Windows + 'win11_debug': 'win_clang_debug_bot_x64', + 'win11_release': 'win_clang_release_bot_x64', 'win_asan': 'win_asan_clang_release_bot_x64', 'win_compile_x64_clang_dbg': 'win_clang_debug_bot_x64', 'win_compile_x64_clang_rel': 'win_clang_release_bot_x64', @@ -216,6 +220,7 @@ 'dummy_audio_file_devices_no_protobuf': 'dummy_audio_file_devices_no_protobuf_x86', 'rtti_no_sctp': 'rtti_no_sctp_no_unicode_win_x86', + 'disable_trace_events': 'disable_trace_events_x86', }, } }, @@ -300,6 +305,12 @@ 'debug_bot_arm64': ['openh264', 'debug_bot', 'arm64', 'h265'], 'debug_bot_x64': ['openh264', 'debug_bot', 'x64', 'h265'], 'debug_bot_x86': ['openh264', 'debug_bot', 'x86', 'h265'], + 'disable_trace_events_android_arm': + ['android', 'arm', 'disable_trace_events', 'release_bot'], + 'disable_trace_events_x64': + ['x64', 'disable_trace_events', 'release_bot'], + 'disable_trace_events_x86': + ['x86', 'disable_trace_events', 'release_bot'], 'dummy_audio_file_devices_no_protobuf_android_arm': [ 'android', 'debug_static_bot', 'arm', 'dummy_audio_file_devices', 'no_protobuf' @@ -449,6 +460,9 @@ 'debug_static_bot': { 'mixins': ['debug', 'minimal_symbols', 'reclient', 'strict_field_trials'], }, + 'disable_trace_events': { + 'gn_args': 'rtc_disable_trace_events=true', + }, 'dummy_audio_file_devices': { 'gn_args': 'rtc_use_dummy_audio_file_devices=true', }, |