From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:43:14 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- third_party/libwebrtc/moz-patch-stack/0092.patch | 54 ++++++++++++++---------- 1 file changed, 32 insertions(+), 22 deletions(-) (limited to 'third_party/libwebrtc/moz-patch-stack/0092.patch') diff --git a/third_party/libwebrtc/moz-patch-stack/0092.patch b/third_party/libwebrtc/moz-patch-stack/0092.patch index 3fcbcd0f94..b0cdd2d540 100644 --- a/third_party/libwebrtc/moz-patch-stack/0092.patch +++ b/third_party/libwebrtc/moz-patch-stack/0092.patch @@ -1,30 +1,40 @@ From: Michael Froman -Date: Thu, 5 Oct 2023 14:21:00 +0000 -Subject: Bug 1857037 - pt1 - add shim gni files to limit BUILD.gn changes. - r=ng,webrtc-reviewers +Date: Tue, 14 Feb 2023 03:27:00 +0000 +Subject: Bug 1816173 - pt12 - add shim config for + third_party/libwebrtc/testing/{gmock|gtest} r=ng -Differential Revision: https://phabricator.services.mozilla.com/D190104 -Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/a84d39db037cbe34aa19588b0d18335eb5e2d79b +We don't vendor third_party/libwebrtc/third_party/gmock + third_party/libwebrtc/third_party/gtest, so: +- add BUILD.gn to avoid scattered BUILD.gn changes + +Differential Revision: https://phabricator.services.mozilla.com/D169674 +Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/4ea9d2db79c42a144235e45c47c71adf1dd01fdc --- - testing/libfuzzer/fuzzer_test.gni | 2 ++ - testing/test.gni | 2 ++ - 2 files changed, 4 insertions(+) - create mode 100644 testing/libfuzzer/fuzzer_test.gni - create mode 100644 testing/test.gni + testing/gmock/BUILD.gn | 5 +++++ + testing/gtest/BUILD.gn | 5 +++++ + 2 files changed, 10 insertions(+) + create mode 100644 testing/gmock/BUILD.gn + create mode 100644 testing/gtest/BUILD.gn -diff --git a/testing/libfuzzer/fuzzer_test.gni b/testing/libfuzzer/fuzzer_test.gni +diff --git a/testing/gmock/BUILD.gn b/testing/gmock/BUILD.gn new file mode 100644 -index 0000000000..8fdf3cdad2 +index 0000000000..a2a1efdea9 --- /dev/null -+++ b/testing/libfuzzer/fuzzer_test.gni -@@ -0,0 +1,2 @@ -+# "empty" file in place of importing new testing/libfuzzer -+# to allow BUILD.gn imports to succeed. -diff --git a/testing/test.gni b/testing/test.gni ++++ b/testing/gmock/BUILD.gn +@@ -0,0 +1,5 @@ ++import("//third_party/libaom/options.gni") ++import("../../webrtc.gni") ++ ++rtc_library("gmock") { ++} +diff --git a/testing/gtest/BUILD.gn b/testing/gtest/BUILD.gn new file mode 100644 -index 0000000000..f46fa82778 +index 0000000000..c9c2703c37 --- /dev/null -+++ b/testing/test.gni -@@ -0,0 +1,2 @@ -+# "empty" file in place of importing new testing/test.gni -+# to allow BUILD.gn imports to succeed. ++++ b/testing/gtest/BUILD.gn +@@ -0,0 +1,5 @@ ++import("//third_party/libaom/options.gni") ++import("../../webrtc.gni") ++ ++rtc_library("gtest") { ++} -- cgit v1.2.3