mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1828517 - Vendor libwebrtc from 05ce032486 

Upstream commit: https://webrtc.googlesource.com/src/+/05ce032486e4d759bc8943c7b4e6a4f1d3b584c4
    Remove the //rtc_base target

    Bug: webrtc:9838
    Change-Id: I17d2a011df20019c517ae92ff25a778070065a5b
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/291185
    Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
    Commit-Queue: Florent Castelli <orphis@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#39173}
This commit is contained in:
Michael Froman 2023-04-21 13:02:04 -05:00
Родитель ce90fa2f0a
Коммит a5080ef153
7 изменённых файлов: 48 добавлений и 382 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
third_party/libwebrtc/README.moz-ff-commit поставляемый
Просмотреть файл

@ -21135,3 +21135,6 @@ d3b9e71b0e
# MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
9ad10bc492
# MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
05ce032486

2
third_party/libwebrtc/README.mozilla поставляемый
Просмотреть файл

@ -14112,3 +14112,5 @@ libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-l
libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-21T17:56:27.364803.
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-21T17:57:22.651526.
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-21T18:01:52.623142.

118
third_party/libwebrtc/moz-patch-stack/0036.patch поставляемый
Просмотреть файл

@ -5,29 +5,29 @@ Subject: Bug 1654112 - Tweak upstream gn files for Firefox build. r=ng
Differential Revision: https://phabricator.services.mozilla.com/D130075
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/127ace4d8887f11abb201d300a849772a2b519f8
---
.gn | 2 +
BUILD.gn | 26 +++++++-
api/BUILD.gn | 8 ++-
api/task_queue/BUILD.gn | 2 +
api/transport/BUILD.gn | 2 +
common_audio/BUILD.gn | 4 --
common_audio/fir_filter_avx2.cc | 2 +
common_audio/intrin.h | 8 +++
media/BUILD.gn | 30 +++++++++
.gn | 2 ++
BUILD.gn | 26 +++++++++++++-
api/BUILD.gn | 8 ++++-
api/task_queue/BUILD.gn | 2 ++
api/transport/BUILD.gn | 2 ++
common_audio/BUILD.gn | 4 ---
common_audio/fir_filter_avx2.cc | 2 ++
common_audio/intrin.h | 8 +++++
media/BUILD.gn | 30 ++++++++++++++++
modules/audio_coding/BUILD.gn | 2 +-
modules/audio_device/BUILD.gn | 8 +--
modules/audio_processing/aec3/BUILD.gn | 13 ++--
modules/audio_device/BUILD.gn | 8 ++---
modules/audio_processing/aec3/BUILD.gn | 13 +++----
.../aec3/adaptive_fir_filter_avx2.cc | 3 +-
.../audio_processing/agc2/rnn_vad/BUILD.gn | 2 +-
modules/desktop_capture/BUILD.gn | 29 +--------
modules/portal/BUILD.gn | 24 +++++++
modules/video_capture/BUILD.gn | 11 +---
modules/video_coding/BUILD.gn | 6 ++
rtc_base/BUILD.gn | 62 ++++++++++++++++++-
modules/desktop_capture/BUILD.gn | 29 +---------------
modules/portal/BUILD.gn | 24 +++++++++++++
modules/video_capture/BUILD.gn | 11 +-----
modules/video_coding/BUILD.gn | 6 ++++
rtc_base/BUILD.gn | 4 ++-
rtc_base/system/BUILD.gn | 2 +-
test/BUILD.gn | 14 +++++
webrtc.gni | 34 ++++++----
22 files changed, 220 insertions(+), 74 deletions(-)
test/BUILD.gn | 14 ++++++++
webrtc.gni | 34 ++++++++++++-------
22 files changed, 162 insertions(+), 74 deletions(-)
create mode 100644 common_audio/intrin.h
diff --git a/.gn b/.gn
@ -549,7 +549,7 @@ index fe63804b19..e1b5e4ba84 100644
deps = [
":codec_globals_headers",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 7d236bc12c..9301622177 100644
index 0d8bd4f759..7e162cecbb 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -820,7 +820,9 @@ rtc_library("rtc_json") {
@ -562,83 +562,7 @@ index 7d236bc12c..9301622177 100644
if (rtc_build_json) {
deps += [ "//third_party/jsoncpp" ]
} else {
@@ -1208,6 +1210,62 @@ rtc_library("rtc_base") {
"stream.h",
"unique_id_generator.h",
]
+ if (build_with_mozilla) {
+ sources -= [
+ "async_packet_socket.cc",
+ "async_packet_socket.h",
+ "async_tcp_socket.cc",
+ "async_tcp_socket.h",
+ "async_udp_socket.cc",
+ "async_udp_socket.h",
+ "helpers.cc",
+ "helpers.h",
+ "http_common.cc",
+ "http_common.h",
+ "mdns_responder_interface.h",
+ "message_digest.cc",
+ "message_digest.h",
+ "net_helper.cc",
+ "net_helper.h",
+ "network.cc",
+ "network.h",
+ "openssl.h",
+ "openssl_adapter.cc",
+ "openssl_adapter.h",
+ "openssl_digest.cc",
+ "openssl_digest.h",
+ "openssl_key_pair.cc",
+ "openssl_key_pair.h",
+ "openssl_session_cache.cc",
+ "openssl_session_cache.h",
+ "openssl_stream_adapter.cc",
+ "openssl_stream_adapter.h",
+ "openssl_utility.cc",
+ "openssl_utility.h",
+ "proxy_info.cc",
+ "proxy_info.h",
+ "rtc_certificate.cc",
+ "rtc_certificate.h",
+ "rtc_certificate_generator.cc",
+ "rtc_certificate_generator.h",
+ "socket_adapters.cc",
+ "socket_adapters.h",
+ "socket_address_pair.cc",
+ "socket_address_pair.h",
+ "ssl_adapter.cc",
+ "ssl_adapter.h",
+ "ssl_certificate.cc",
+ "ssl_certificate.h",
+ "ssl_fingerprint.cc",
+ "ssl_fingerprint.h",
+ "ssl_identity.cc",
+ "ssl_identity.h",
+ "ssl_stream_adapter.cc",
+ "ssl_stream_adapter.h",
+ "unique_id_generator.cc",
+ "unique_id_generator.h",
+ ]
+ }
# If we are building the SSL library ourselves, we know it's BoringSSL.
if (rtc_build_ssl) {
@@ -1216,10 +1274,12 @@ rtc_library("rtc_base") {
"boringssl_identity.h",
]
} else {
+ if (!build_with_mozilla) {
sources += [
"openssl_certificate.h",
"openssl_identity.h",
]
+ }
}
if (build_with_chromium) {
@@ -2269,7 +2329,7 @@ if (rtc_include_tests) {
@@ -2073,7 +2075,7 @@ if (rtc_include_tests) {
}
}

2
third_party/libwebrtc/moz-patch-stack/0073.patch поставляемый
Просмотреть файл

@ -29,7 +29,7 @@ index c9b4a5d0ec..1c342cb57e 100644
rtc_library("task_queue_test") {
visibility = [ "*" ]
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 9301622177..70d374d065 100644
index 7e162cecbb..3cd0bfff06 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -686,10 +686,14 @@ if (is_mac || is_ios) {

2
third_party/libwebrtc/moz-patch-stack/0084.patch поставляемый
Просмотреть файл

@ -152,7 +152,7 @@ index e35a442025..61cd531edd 100644
testonly = true
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 70d374d065..2eb906a4ab 100644
index 3cd0bfff06..0b1e2a6208 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -283,6 +283,7 @@ rtc_library("sample_counter") {

99
third_party/libwebrtc/moz-patch-stack/0096.patch поставляемый
Просмотреть файл

@ -4,73 +4,14 @@ Subject: Bug 1828517 - (fix-a138c6c8a5) handle file moves in BUILD.gn
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/cf7e333da17689b3c115a6ffd07fab042bc5f086
---
rtc_base/BUILD.gn | 74 +++++++++++++++--------------------------------
1 file changed, 24 insertions(+), 50 deletions(-)
rtc_base/BUILD.gn | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 2eb906a4ab..98667daf2c 100644
index 0b1e2a6208..7573a137ab 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -1218,58 +1218,8 @@ rtc_library("rtc_base") {
]
if (build_with_mozilla) {
sources -= [
- "async_packet_socket.cc",
- "async_packet_socket.h",
- "async_tcp_socket.cc",
- "async_tcp_socket.h",
- "async_udp_socket.cc",
- "async_udp_socket.h",
- "helpers.cc",
- "helpers.h",
- "http_common.cc",
- "http_common.h",
"mdns_responder_interface.h",
- "message_digest.cc",
- "message_digest.h",
- "net_helper.cc",
- "net_helper.h",
- "network.cc",
- "network.h",
"openssl.h",
- "openssl_adapter.cc",
- "openssl_adapter.h",
- "openssl_digest.cc",
- "openssl_digest.h",
- "openssl_key_pair.cc",
- "openssl_key_pair.h",
- "openssl_session_cache.cc",
- "openssl_session_cache.h",
- "openssl_stream_adapter.cc",
- "openssl_stream_adapter.h",
- "openssl_utility.cc",
- "openssl_utility.h",
- "proxy_info.cc",
- "proxy_info.h",
- "rtc_certificate.cc",
- "rtc_certificate.h",
- "rtc_certificate_generator.cc",
- "rtc_certificate_generator.h",
- "socket_adapters.cc",
- "socket_adapters.h",
- "socket_address_pair.cc",
- "socket_address_pair.h",
- "ssl_adapter.cc",
- "ssl_adapter.h",
- "ssl_certificate.cc",
- "ssl_certificate.h",
- "ssl_fingerprint.cc",
- "ssl_fingerprint.h",
- "ssl_identity.cc",
- "ssl_identity.h",
- "ssl_stream_adapter.cc",
- "ssl_stream_adapter.h",
- "unique_id_generator.cc",
- "unique_id_generator.h",
]
}
@@ -1401,6 +1351,7 @@ if (!build_with_chromium) {
@@ -1147,6 +1147,7 @@ if (!build_with_chromium) {
}
rtc_library("network") {
@ -78,7 +19,7 @@ index 2eb906a4ab..98667daf2c 100644
visibility = [ "*" ]
sources = [
"network.cc",
@@ -1439,16 +1390,20 @@ rtc_library("network") {
@@ -1185,16 +1186,20 @@ rtc_library("network") {
deps += [ ":win32" ]
}
}
@ -99,7 +40,7 @@ index 2eb906a4ab..98667daf2c 100644
visibility = [ "*" ]
sources = [
"net_helper.cc",
@@ -1457,8 +1412,10 @@ rtc_library("net_helper") {
@@ -1203,8 +1208,10 @@ rtc_library("net_helper") {
absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
deps = [ "system:rtc_export" ]
}
@ -110,7 +51,7 @@ index 2eb906a4ab..98667daf2c 100644
visibility = [ "*" ]
sources = [
"socket_adapters.cc",
@@ -1478,6 +1435,7 @@ rtc_library("socket_adapters") {
@@ -1224,6 +1231,7 @@ rtc_library("socket_adapters") {
]
absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
}
@ -118,7 +59,7 @@ index 2eb906a4ab..98667daf2c 100644
rtc_library("network_route") {
sources = [
@@ -1492,6 +1450,7 @@ rtc_library("network_route") {
@@ -1238,6 +1246,7 @@ rtc_library("network_route") {
}
rtc_library("async_tcp_socket") {
@ -126,7 +67,7 @@ index 2eb906a4ab..98667daf2c 100644
sources = [
"async_tcp_socket.cc",
"async_tcp_socket.h",
@@ -1510,8 +1469,10 @@ rtc_library("async_tcp_socket") {
@@ -1256,8 +1265,10 @@ rtc_library("async_tcp_socket") {
"third_party/sigslot",
]
}
@ -137,7 +78,7 @@ index 2eb906a4ab..98667daf2c 100644
visibility = [ "*" ]
sources = [
"async_udp_socket.cc",
@@ -1533,8 +1494,10 @@ rtc_library("async_udp_socket") {
@@ -1279,8 +1290,10 @@ rtc_library("async_udp_socket") {
]
absl_deps = [ "//third_party/abseil-cpp/absl/types:optional" ]
}
@ -148,7 +89,7 @@ index 2eb906a4ab..98667daf2c 100644
visibility = [ "*" ]
sources = [
"async_packet_socket.cc",
@@ -1552,6 +1515,7 @@ rtc_library("async_packet_socket") {
@@ -1298,6 +1311,7 @@ rtc_library("async_packet_socket") {
"third_party/sigslot",
]
}
@ -156,7 +97,7 @@ index 2eb906a4ab..98667daf2c 100644
rtc_library("mdns_responder_interface") {
sources = [ "mdns_responder_interface.h" ]
@@ -1564,6 +1528,7 @@ rtc_library("dscp") {
@@ -1310,6 +1324,7 @@ rtc_library("dscp") {
}
rtc_library("proxy_info") {
@ -164,7 +105,7 @@ index 2eb906a4ab..98667daf2c 100644
visibility = [ "*" ]
sources = [
"proxy_info.cc",
@@ -1574,6 +1539,7 @@ rtc_library("proxy_info") {
@@ -1320,6 +1335,7 @@ rtc_library("proxy_info") {
":socket_address",
]
}
@ -172,7 +113,7 @@ index 2eb906a4ab..98667daf2c 100644
rtc_library("file_rotating_stream") {
sources = [
@@ -1602,6 +1568,7 @@ rtc_library("data_rate_limiter") {
@@ -1348,6 +1364,7 @@ rtc_library("data_rate_limiter") {
}
rtc_library("unique_id_generator") {
@ -180,7 +121,7 @@ index 2eb906a4ab..98667daf2c 100644
sources = [
"unique_id_generator.cc",
"unique_id_generator.h",
@@ -1616,6 +1583,7 @@ rtc_library("unique_id_generator") {
@@ -1362,6 +1379,7 @@ rtc_library("unique_id_generator") {
]
absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
}
@ -188,7 +129,7 @@ index 2eb906a4ab..98667daf2c 100644
rtc_library("crc32") {
sources = [
@@ -1643,6 +1611,7 @@ rtc_library("stream") {
@@ -1389,6 +1407,7 @@ rtc_library("stream") {
}
rtc_library("rtc_certificate_generator") {
@ -196,7 +137,7 @@ index 2eb906a4ab..98667daf2c 100644
visibility = [ "*" ]
sources = [
"rtc_certificate_generator.cc",
@@ -1660,8 +1629,10 @@ rtc_library("rtc_certificate_generator") {
@@ -1406,8 +1425,10 @@ rtc_library("rtc_certificate_generator") {
"//third_party/abseil-cpp/absl/types:optional",
]
}
@ -207,7 +148,7 @@ index 2eb906a4ab..98667daf2c 100644
visibility = [ "*" ]
sources = [
"helpers.cc",
@@ -1760,6 +1731,7 @@ rtc_library("ssl") {
@@ -1506,6 +1527,7 @@ rtc_library("ssl") {
deps += [ ":win32" ]
}
}
@ -215,7 +156,7 @@ index 2eb906a4ab..98667daf2c 100644
rtc_library("crypt_string") {
sources = [
@@ -1769,6 +1741,7 @@ rtc_library("crypt_string") {
@@ -1515,6 +1537,7 @@ rtc_library("crypt_string") {
}
rtc_library("http_common") {
@ -223,7 +164,7 @@ index 2eb906a4ab..98667daf2c 100644
sources = [
"http_common.cc",
"http_common.h",
@@ -1785,6 +1758,7 @@ rtc_library("http_common") {
@@ -1531,6 +1554,7 @@ rtc_library("http_common") {
absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
}

204
third_party/libwebrtc/rtc_base/BUILD.gn поставляемый
Просмотреть файл

@ -1091,210 +1091,6 @@ if (is_win) {
}
}
rtc_library("rtc_base") {
visibility = [ "*" ]
cflags = []
cflags_cc = []
libs = []
defines = []
deps = [
":async_packet_socket",
":async_resolver_interface",
":async_socket",
":async_tcp_socket",
":async_udp_socket",
":buffer",
":byte_buffer",
":byte_order",
":callback_list",
":checks",
":copy_on_write_buffer",
":crc32",
":crypt_string",
":data_rate_limiter",
":dscp",
":file_rotating_stream",
":http_common",
":ip_address",
":logging",
":macromagic",
":mdns_responder_interface",
":net_helper",
":network",
":network_constants",
":network_route",
":null_socket_server",
":proxy_info",
":refcount",
":rtc_certificate_generator",
":rtc_event",
":rtc_task_queue",
":safe_conversions",
":socket",
":socket_adapters",
":socket_address",
":socket_address_pair",
":socket_factory",
":socket_server",
":ssl",
":stream",
":stringutils",
":threading",
":timeutils",
":unique_id_generator",
":zero_memory",
"../api:array_view",
"../api:field_trials_view",
"../api:function_view",
"../api:make_ref_counted",
"../api:refcountedbase",
"../api:scoped_refptr",
"../api:sequence_checker",
"../api/numerics",
"../api/task_queue",
"../api/task_queue:pending_task_safety_flag",
"../api/transport:field_trial_based_config",
"../api/units:time_delta",
"../rtc_base/experiments:field_trial_parser",
"../system_wrappers:field_trial",
"memory:always_valid_pointer",
"network:sent_packet",
"synchronization:mutex",
"system:file_wrapper",
"system:inline",
"system:no_unique_address",
"system:rtc_export",
"task_utils:repeating_task",
"third_party/base64",
"third_party/sigslot",
]
absl_deps = [
"//third_party/abseil-cpp/absl/algorithm:container",
"//third_party/abseil-cpp/absl/base:core_headers",
"//third_party/abseil-cpp/absl/container:flat_hash_map",
"//third_party/abseil-cpp/absl/functional:any_invocable",
"//third_party/abseil-cpp/absl/memory",
"//third_party/abseil-cpp/absl/strings",
"//third_party/abseil-cpp/absl/types:optional",
]
public_configs = []
sources = [
# Kept during transition
"async_packet_socket.h",
"async_tcp_socket.h",
"async_udp_socket.h",
"crc32.h",
"crypt_string.h",
"data_rate_limiter.h",
"dscp.h",
"file_rotating_stream.h",
"helpers.h",
"http_common.h",
"mdns_responder_interface.h",
"message_digest.h",
"net_helper.h",
"network.h",
"network_route.h",
"openssl.h",
"openssl_adapter.h",
"openssl_digest.h",
"openssl_key_pair.h",
"openssl_session_cache.h",
"openssl_stream_adapter.h",
"openssl_utility.h",
"proxy_info.h",
"rtc_certificate.h",
"rtc_certificate_generator.h",
"socket_adapters.h",
"socket_address_pair.h",
"ssl_adapter.h",
"ssl_certificate.h",
"ssl_fingerprint.h",
"ssl_identity.h",
"ssl_stream_adapter.h",
"stream.h",
"unique_id_generator.h",
]
if (build_with_mozilla) {
sources -= [
"mdns_responder_interface.h",
"openssl.h",
]
}
# If we are building the SSL library ourselves, we know it's BoringSSL.
if (rtc_build_ssl) {
sources += [
"boringssl_certificate.h",
"boringssl_identity.h",
]
} else {
if (!build_with_mozilla) {
sources += [
"openssl_certificate.h",
"openssl_identity.h",
]
}
}
if (build_with_chromium) {
include_dirs = [ "../../boringssl/src/include" ]
} else {
sources += [
"log_sinks.h",
"rolling_accumulator.h",
"ssl_roots.h",
]
deps += [
":log_sinks",
":rolling_accumulator",
":rtc_numerics",
]
if (is_win) {
sources += [ "win32_socket_init.h" ]
deps += [ ":win32_socket_init" ]
}
} # !build_with_chromium
if (rtc_build_ssl) {
deps += [ "//third_party/boringssl" ]
} else {
configs += [ ":external_ssl_library" ]
}
if (is_android) {
deps += [ ":ifaddrs_android" ]
}
if (is_linux || is_chromeos) {
libs += [
"dl",
"rt",
]
}
if (is_ios) {
frameworks = [
"CFNetwork.framework",
"Foundation.framework",
"Security.framework",
"SystemConfiguration.framework",
"UIKit.framework",
]
}
if (is_win) {
deps += [ ":win32" ]
}
if (is_posix || is_fuchsia) {
sources += [ "ifaddrs_converter.h" ]
}
}
rtc_library("ifaddrs_converter") {
sources = []
deps = [