commit b2118f56bd9a9cc9c7c10921561df24bb48afe12
parent 24fb53906a02afbddf018e11b7ed1552b4d34d2d
Author: Michael Froman <mfroman@mozilla.com>
Date: Wed, 15 Oct 2025 14:32:25 -0500
Bug 1993083 - Vendor libwebrtc from 5682d46450 - moz.build file updates
Diffstat:
3 files changed, 1 insertion(+), 244 deletions(-)
diff --git a/CLOBBER b/CLOBBER
@@ -22,4 +22,4 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.
-Modified build files in third_party/libwebrtc - Bug 1993083 - Vendor libwebrtc from 00b714e1fd
+Modified build files in third_party/libwebrtc - Bug 1993083 - Vendor libwebrtc from 5682d46450
diff --git a/third_party/libwebrtc/api/field_trials_gn/moz.build b/third_party/libwebrtc/api/field_trials_gn/moz.build
@@ -1,242 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-
- ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
- ### DO NOT edit it by hand. ###
-
-COMPILE_FLAGS["OS_INCLUDES"] = []
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
-DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
-DEFINES["WEBRTC_LIBRARY_IMPL"] = True
-DEFINES["WEBRTC_MOZILLA_BUILD"] = True
-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
-DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
-DEFINES["_LIBCPP_HARDENING_MODE"] = "_LIBCPP_HARDENING_MODE_NONE"
-
-FINAL_LIBRARY = "xul"
-
-
-LOCAL_INCLUDES += [
- "!/dist/include/libwebrtc_overrides",
- "!/ipc/ipdl/_ipdlheaders",
- "!/third_party/libwebrtc/gen",
- "/ipc/chromium/src",
- "/third_party/abseil-cpp/",
- "/third_party/libwebrtc/",
- "/tools/profiler/public"
-]
-
-UNIFIED_SOURCES += [
- "/third_party/libwebrtc/api/field_trials.cc"
-]
-
-if not CONFIG["MOZ_DEBUG"]:
-
- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "0"
- DEFINES["NDEBUG"] = True
- DEFINES["NVALGRIND"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1":
-
- DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
-
-if CONFIG["OS_TARGET"] == "Android":
-
- CXXFLAGS += [
- "-std=gnu++20"
- ]
-
- DEFINES["ANDROID"] = True
- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r27_1"
- DEFINES["HAVE_SYS_UIO_H"] = True
- DEFINES["WEBRTC_ANDROID"] = True
- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_GNU_SOURCE"] = True
- DEFINES["__ANDROID_UNAVAILABLE_SYMBOLS_ARE_WEAK__"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
- OS_LIBS += [
- "log"
- ]
-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- CXXFLAGS += [
- "-std=gnu++20"
- ]
-
- DEFINES["WEBRTC_MAC"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-if CONFIG["OS_TARGET"] == "Linux":
-
- CXXFLAGS += [
- "-std=gnu++20"
- ]
-
- DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["USE_UDEV"] = True
- DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
- DEFINES["_GLIBCXX_ASSERTIONS"] = "1"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-if CONFIG["OS_TARGET"] == "OpenBSD":
-
- CXXFLAGS += [
- "-std=gnu++20"
- ]
-
- DEFINES["USE_GLIB"] = "1"
- DEFINES["USE_OZONE"] = "1"
- DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
-if CONFIG["OS_TARGET"] == "WINNT":
-
- CXXFLAGS += [
- "-std:c++20"
- ]
-
- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
- DEFINES["NOMINMAX"] = True
- DEFINES["NTDDI_VERSION"] = "0x0A000000"
- DEFINES["PSAPI_VERSION"] = "2"
- DEFINES["RTC_ENABLE_WIN_WGC"] = True
- DEFINES["UNICODE"] = True
- DEFINES["USE_AURA"] = "1"
- DEFINES["WEBRTC_WIN"] = True
- DEFINES["WIN32"] = True
- DEFINES["WIN32_LEAN_AND_MEAN"] = True
- DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
- DEFINES["WINVER"] = "0x0A00"
- DEFINES["_ATL_NO_OPENGL"] = True
- DEFINES["_CRT_NONSTDC_NO_WARNINGS"] = True
- DEFINES["_CRT_RAND_S"] = True
- DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
- DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
- DEFINES["_HAS_EXCEPTIONS"] = "0"
- DEFINES["_HAS_NODISCARD"] = True
- DEFINES["_SCL_SECURE_NO_DEPRECATE"] = True
- DEFINES["_SECURE_ATL"] = True
- DEFINES["_UNICODE"] = True
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["_WINSOCK_DEPRECATED_NO_WARNINGS"] = True
- DEFINES["__STD_C"] = True
-
- OS_LIBS += [
- "crypt32",
- "iphlpapi",
- "secur32",
- "winmm"
- ]
-
-if CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["WEBRTC_ARCH_ARM64"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
- DEFINES["__ARM_NEON__"] = "1"
-
-if CONFIG["TARGET_CPU"] == "arm":
-
- CXXFLAGS += [
- "-mfpu=neon"
- ]
-
- DEFINES["WEBRTC_ARCH_ARM"] = True
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
-if CONFIG["TARGET_CPU"] == "loongarch64":
-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["TARGET_CPU"] == "mips32":
-
- DEFINES["MIPS32_LE"] = True
- DEFINES["MIPS_FPU_LE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["TARGET_CPU"] == "mips64":
-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["TARGET_CPU"] == "x86":
-
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
-if CONFIG["TARGET_CPU"] == "x86_64":
-
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "OpenBSD":
-
- DEFINES["_DEBUG"] = True
-
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-
-if CONFIG["OS_TARGET"] == "Android" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
- CXXFLAGS += [
- "-msse2"
- ]
-
- DEFINES["_GNU_SOURCE"] = True
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-
- DEFINES["_GNU_SOURCE"] = True
-
-Library("field_trials_gn")
diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build
@@ -46,7 +46,6 @@ DIRS += [
"/third_party/libwebrtc/api/environment/environment_factory_gn",
"/third_party/libwebrtc/api/environment/environment_gn",
"/third_party/libwebrtc/api/fec_controller_api_gn",
- "/third_party/libwebrtc/api/field_trials_gn",
"/third_party/libwebrtc/api/field_trials_registry_gn",
"/third_party/libwebrtc/api/field_trials_view_gn",
"/third_party/libwebrtc/api/frame_transformer_factory_gn",
