From c9dc603bdcad0694c7771f74117366d2bd5a1378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82az=CC=87ej=20Pankowski?= <86720177+pblazej@users.noreply.github.com> Date: Wed, 18 Jun 2025 14:40:31 +0200 Subject: [PATCH 1/2] Fix mocks patch --- build/patches/fix_mocks.patch | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/build/patches/fix_mocks.patch b/build/patches/fix_mocks.patch index b248394..8a4075d 100644 --- a/build/patches/fix_mocks.patch +++ b/build/patches/fix_mocks.patch @@ -1,25 +1,26 @@ diff --git a/modules/audio_device/include/mock_audio_device.h b/modules/audio_device/include/mock_audio_device.h -index 8483aa3da8..f66cdca0ba 100644 +index 191caf604f..f16b4d9c79 100644 --- a/modules/audio_device/include/mock_audio_device.h +++ b/modules/audio_device/include/mock_audio_device.h -@@ -149,6 +149,7 @@ class MockAudioDeviceModule : public AudioDeviceModule { - (AudioParameters * params), - (const, override)); - #endif // WEBRTC_IOS +@@ -138,6 +138,8 @@ class MockAudioDeviceModule : public AudioDeviceModule { + MOCK_METHOD(int32_t, EnableBuiltInAGC, (bool enable), (override)); + MOCK_METHOD(int32_t, EnableBuiltInNS, (bool enable), (override)); + MOCK_METHOD(int32_t, GetPlayoutUnderrunCount, (), (const, override)); ++ MOCK_METHOD(std::optional, GetStats, (), (const, override)); + MOCK_METHOD(int32_t, SetAudioDeviceSink, (AudioDeviceSink* sink), (const, override)); - }; - } // namespace test - } // namespace webrtc + #if defined(WEBRTC_IOS) + MOCK_METHOD(int, + GetPlayoutAudioParameters, diff --git a/pc/test/fake_audio_capture_module.h b/pc/test/fake_audio_capture_module.h -index c04373cdfd..ab6ff3492a 100644 +index b5b1574818..084d02caed 100644 --- a/pc/test/fake_audio_capture_module.h +++ b/pc/test/fake_audio_capture_module.h -@@ -137,6 +137,8 @@ class FakeAudioCaptureModule : public webrtc::AudioDeviceModule { +@@ -135,6 +135,8 @@ class FakeAudioCaptureModule : public webrtc::AudioDeviceModule { int32_t GetPlayoutUnderrunCount() const override { return -1; } + int32_t SetAudioDeviceSink(webrtc::AudioDeviceSink* sink) const override { return 0; } + - absl::optional GetStats() const override { + std::optional GetStats() const override { return webrtc::AudioDeviceModule::Stats(); } From 0497c0c8f3425f820aa72785d9b768cbc3bc5cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C5=82az=CC=87ej=20Pankowski?= <86720177+pblazej@users.noreply.github.com> Date: Mon, 23 Jun 2025 09:01:07 +0200 Subject: [PATCH 2/2] Use autoninja everywhere --- build/run.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/run.py b/build/run.py index 4922261..21b23c2 100644 --- a/build/run.py +++ b/build/run.py @@ -543,7 +543,7 @@ def build_webrtc_ios( ] gn_gen(webrtc_src_dir, work_dir, gn_args, extra_gn_args) if not nobuild: - cmd(['ninja', '-C', work_dir, *get_build_targets('ios')]) + cmd(['autoninja', '-C', work_dir, *get_build_targets('ios')]) ar = '/usr/bin/ar' archive_objects(ar, os.path.join(work_dir, 'obj'), os.path.join(work_dir, 'libwebrtc.a')) if test: @@ -627,7 +627,7 @@ def build_webrtc_android( ] gn_gen(webrtc_src_dir, work_dir, gn_args, extra_gn_args) if not nobuild: - cmd(['ninja', '-C', work_dir, *get_build_targets('android')]) + cmd(['autoninja', '-C', work_dir, *get_build_targets('android')]) ar = os.path.join(webrtc_src_dir, 'third_party/llvm-build/Release+Asserts/bin/llvm-ar') archive_objects(ar, os.path.join(work_dir, 'obj'), os.path.join(work_dir, 'libwebrtc.a')) if test: @@ -719,7 +719,7 @@ def build_webrtc( if nobuild: return - cmd(['ninja', '-C', webrtc_build_dir, *get_build_targets(target)]) + cmd(['autoninja', '-C', webrtc_build_dir, *get_build_targets(target)]) if test: cmd(['autoninja', '-C', webrtc_build_dir, 'rtc_unittests'])