From nobody Mon Feb 06 21:09:05 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P9f5G0kWhz3nQmS; Mon, 6 Feb 2023 21:09:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P9f5G0KR9z43SK; Mon, 6 Feb 2023 21:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675717746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a5j6QQWgKmvqhmkBknwbbACtgmCRLARAmhQj8Smn1Wc=; b=Aya8SKQg+wC6EVm8YTEFabcE+ht11ZAqOdrycp1jHFMvnJENJEkjXDS4djGtErqqAIqyCO bOx59Lf7+OayQSuHughQwC0mrVGN63HK4HWQG6kWRepdVB/Bu1N85bjNsFC8MGujFAmPaX +CM7Vwfv4b4xZhgtf0VPzk4k2i6aLxbi7/VEP87hqDb1YP1aqR/Fu3PIdiVlFYICkJr8t8 ai/pOXeB1rL0ytUYYH/OlGHdJQB3njVOQ0UPtGwNH6YSrpkG8fwrr7NvManSczPeo7ssEO kNrqc+8dOxMX4giwDGooonFRqoHsP2/9/8qjjM8BlzLJuig8iRDXfayKlNc5AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675717746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a5j6QQWgKmvqhmkBknwbbACtgmCRLARAmhQj8Smn1Wc=; b=qhioDFoa4hKTs4xroU2t3xcUbGOGoHgtCzmy2qtDXkYpflaPmtr71QQ403LSmtoOi8/a6g pthEg86cmFPLH9ChEYnqiGlpFkQ3WDlEMF1QHPx6zm9qhZFzF3NLx+Plqz9vQP+sjPIZwJ aT1oRqjUe4Rxv9RVW0aIVaKurL3PPlKst9NI2ZKnOjlWvTtGCERc4iZq+FTbifh6wlioQY eN17UukZqfwCsqXnOiCqBGL1pWcVdLXN1u88Ja8twGww2nhkMuNu3tg9y0qLhIG5Bt16SR OoItKF/DY6CCib8I1rOZ/hqFqdTH5PzRNcVrDoP6++gw+9z1+GLEVnhrxP8lmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675717746; a=rsa-sha256; cv=none; b=Q9GDFv+is25N91LpgD7n1ekCIfn6EvBRrIkkUiYr0dJaS82hBvBO8UNjiMRNHUuLtcYN5C OrT6K8C4i76/5rMIzTy8WhAuQNvTTaXXpCXKuJBtgRHBRH8PeKfHmzRKfOR/WFyn6UGrlI 7bX0HAGWEHIKwWBdfvyJuLSUt2VpOi/KN8r/rzTzYkvpw2Psv8JFA8T4mLErkaez0Idjwj s9SGAR9+OSQJslE6Z6GahNa9cCRbGKj4Rz5OtTCiloshv6FOBPB4ga9TzriZxT7BaTP8oF tAmjdSlSsMXRdxjGYbWYUG5OoSzDCrVq1W1Rww7//rQG/GWryKEmwEPcUCNMyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P9f5F52HMzqDp; Mon, 6 Feb 2023 21:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 316L95mh050373; Mon, 6 Feb 2023 21:09:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 316L95vV050372; Mon, 6 Feb 2023 21:09:05 GMT (envelope-from git) Date: Mon, 6 Feb 2023 21:09:05 GMT Message-Id: <202302062109.316L95vV050372@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Christoph Moench-Tegeder Subject: git: 8964321174e2 - main - www/firefox: update to 110.0 (rc1) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cmt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8964321174e217f2f201796d1141a23c9cdcf2a4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cmt: URL: https://cgit.FreeBSD.org/ports/commit/?id=8964321174e217f2f201796d1141a23c9cdcf2a4 commit 8964321174e217f2f201796d1141a23c9cdcf2a4 Author: Christoph Moench-Tegeder AuthorDate: 2023-02-06 20:11:17 +0000 Commit: Christoph Moench-Tegeder CommitDate: 2023-02-06 21:08:31 +0000 www/firefox: update to 110.0 (rc1) Release Notes (soon): https://www.mozilla.org/en-US/firefox/110.0/releasenotes/ --- www/firefox/Makefile | 8 +- www/firefox/distinfo | 6 +- www/firefox/files/patch-libwebrtc-generated | 3647 ++++++++++++++------------- 3 files changed, 1939 insertions(+), 1722 deletions(-) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index cd50cda5e061..958901cb8e69 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,5 +1,5 @@ PORTNAME= firefox -DISTVERSION= 109.0.1 +DISTVERSION= 110.0 PORTEPOCH= 2 CATEGORIES= www wayland MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \ @@ -11,10 +11,10 @@ COMMENT= Web browser based on the browser portion of Mozilla WWW= https://www.mozilla.com/firefox BUILD_DEPENDS= nspr>=4.32:devel/nspr \ - nss>=3.86:security/nss \ - icu>=71.1:devel/icu \ + nss>=3.87:security/nss \ + icu>=72.1:devel/icu \ libevent>=2.1.8:devel/libevent \ - harfbuzz>=5.3.1:print/harfbuzz \ + harfbuzz>=6.0.0:print/harfbuzz \ graphite2>=1.3.14:graphics/graphite2 \ png>=1.6.39:graphics/png \ dav1d>=1.0.0:multimedia/dav1d \ diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 5e9fc2a8e7e6..a1f92d25bf5e 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674861934 -SHA256 (firefox-109.0.1.source.tar.xz) = 5e43fdfb3923ee3a7ae7bc91ef3377a3fc6f8a0c1b87436c19b29458b0d731d9 -SIZE (firefox-109.0.1.source.tar.xz) = 493832884 +TIMESTAMP = 1675715960 +SHA256 (firefox-110.0.source.tar.xz) = fc6f36e601e6d310e46cf5115fd96918b578681f23a6eafd16dcfd000a4835cf +SIZE (firefox-110.0.source.tar.xz) = 489767528 diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated index a37c7b46294d..b8f1123b5821 100644 --- a/www/firefox/files/patch-libwebrtc-generated +++ b/www/firefox/files/patch-libwebrtc-generated @@ -1,7 +1,7 @@ -commit b3770d8e7f0d6fc220353356066c4c1021f37bde +commit 99b8e2dcc99a59e5ccdae1be11a01fef8ca0a9b2 Author: Christoph Moench-Tegeder - regenerate FreeBSD libwebrtc patch for Firefox 109 + regenerate FreeBSD libwebrtc patch for Firefox 110 diff --git third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build index 8fbfa680375d..ae63fb378f55 100644 @@ -20998,7 +20998,7 @@ index c588b3ce0e8f..ded6e4680a88 100644 - Library("video_track_source_constraints_gn") diff --git third_party/libwebrtc/audio/audio_gn/moz.build third_party/libwebrtc/audio/audio_gn/moz.build -index 333c77706b0d..7b9c37cd58af 100644 +index 1f619c4cc799..1881cfe55ecf 100644 --- third_party/libwebrtc/audio/audio_gn/moz.build +++ third_party/libwebrtc/audio/audio_gn/moz.build @@ -12,10 +12,20 @@ AllowCompilerWarnings() @@ -21022,7 +21022,7 @@ index 333c77706b0d..7b9c37cd58af 100644 FINAL_LIBRARY = "webrtc" -@@ -54,174 +64,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -53,174 +63,15 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -54434,7 +54434,7 @@ index 7af9c5fc0071..c4b2d55b1a59 100644 - Library("remote_bitrate_estimator_gn") diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build -index 800b7ccea105..f5f609138c1e 100644 +index 0a05e482015a..e719505dd93d 100644 --- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build +++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build @@ -12,10 +12,20 @@ AllowCompilerWarnings() @@ -54458,7 +54458,7 @@ index 800b7ccea105..f5f609138c1e 100644 FINAL_LIBRARY = "webrtc" -@@ -84,174 +94,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -83,174 +93,15 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -54636,7 +54636,7 @@ index 800b7ccea105..f5f609138c1e 100644 - Library("rtp_rtcp_format_gn") diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build -index 4e7d516d4b7f..bb1a3d90307d 100644 +index ff314f8d6d4e..24f45fa0fdbd 100644 --- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build +++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build @@ -13,10 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" @@ -59148,6 +59148,195 @@ index fe230f262d9d..943834d76711 100644 - DEFINES["_GNU_SOURCE"] = True - Library("codec_timer_gn") +diff --git third_party/libwebrtc/modules/video_coding/timing/frame_delay_delta_kalman_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/frame_delay_delta_kalman_filter_gn/moz.build +index 35e13f86787b..ca8954f56f23 100644 +--- third_party/libwebrtc/modules/video_coding/timing/frame_delay_delta_kalman_filter_gn/moz.build ++++ third_party/libwebrtc/modules/video_coding/timing/frame_delay_delta_kalman_filter_gn/moz.build +@@ -12,10 +12,20 @@ AllowCompilerWarnings() + DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" + DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True + DEFINES["RTC_ENABLE_VP9"] = True ++DEFINES["USE_GLIB"] = "1" ++DEFINES["USE_OZONE"] = "1" ++DEFINES["WEBRTC_BSD"] = True ++DEFINES["WEBRTC_ENABLE_AVX2"] = 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_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 + + FINAL_LIBRARY = "webrtc" + +@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]: + if CONFIG["MOZ_DEBUG"] == "1": + + DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" +- +-if CONFIG["OS_TARGET"] == "Android": +- +- DEFINES["ANDROID"] = True +- DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +- DEFINES["HAVE_SYS_UIO_H"] = True +- DEFINES["WEBRTC_ANDROID"] = True +- DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- DEFINES["WEBRTC_LINUX"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_GNU_SOURCE"] = True +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +- OS_LIBS += [ +- "log" +- ] +- +-if CONFIG["OS_TARGET"] == "Darwin": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- DEFINES["WEBRTC_MAC"] = True +- DEFINES["WEBRTC_POSIX"] = True +- DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True +- DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0" +- DEFINES["__STDC_CONSTANT_MACROS"] = True +- DEFINES["__STDC_FORMAT_MACROS"] = True +- +-if CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["USE_AURA"] = "1" +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_NSS_CERTS"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_UDEV"] = True +- DEFINES["WEBRTC_LINUX"] = 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"] == "OpenBSD": +- +- DEFINES["USE_GLIB"] = "1" +- DEFINES["USE_OZONE"] = "1" +- DEFINES["USE_X11"] = "1" +- DEFINES["WEBRTC_BSD"] = True +- DEFINES["WEBRTC_ENABLE_AVX2"] = 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": +- +- DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True +- DEFINES["NOMINMAX"] = True +- DEFINES["NTDDI_VERSION"] = "0x0A000000" +- DEFINES["PSAPI_VERSION"] = "2" +- DEFINES["UNICODE"] = True +- DEFINES["USE_AURA"] = "1" +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- 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_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["__STD_C"] = True ++ DEFINES["_DEBUG"] = True + + if CONFIG["CPU_ARCH"] == "aarch64": + + DEFINES["WEBRTC_ARCH_ARM64"] = True + DEFINES["WEBRTC_HAS_NEON"] = True + +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = 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["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux": ++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD": + + DEFINES["USE_X11"] = "1" + +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- DEFINES["_GNU_SOURCE"] = True +- +-if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux": +- +- DEFINES["WEBRTC_ENABLE_AVX2"] = True +- DEFINES["_GNU_SOURCE"] = True +- + Library("frame_delay_delta_kalman_filter_gn") diff --git third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build index 84a87f2a49a2..71c277b678e7 100644 --- third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_gn/moz.build @@ -60131,7 +60320,7 @@ index da29622b17bf..01c957b82bfd 100644 - Library("video_codec_interface_gn") diff --git third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build -index 40d6c2fa3440..b2797c97a4b0 100644 +index f04ffa380a96..31af64599f19 100644 --- third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build +++ third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build @@ -12,10 +12,20 @@ AllowCompilerWarnings() @@ -60155,7 +60344,7 @@ index 40d6c2fa3440..b2797c97a4b0 100644 FINAL_LIBRARY = "webrtc" -@@ -59,174 +69,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -57,174 +67,15 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -62847,7 +63036,7 @@ index 9d41f521fdb8..0c3a0c9fcefc 100644 - Library("video_processing_sse2_gn") diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build -index 78a668b8646e..69f69fa74b5e 100644 +index a32d3b325f65..af6aa20b73e2 100644 --- third_party/libwebrtc/moz.build +++ third_party/libwebrtc/moz.build @@ -26,7 +26,9 @@ DIRS += [ @@ -62879,7 +63068,7 @@ index 78a668b8646e..69f69fa74b5e 100644 "/third_party/libwebrtc/modules/module_api_gn", "/third_party/libwebrtc/modules/module_api_public_gn", "/third_party/libwebrtc/modules/module_fec_api_gn", -@@ -460,224 +466,7 @@ DIRS += [ +@@ -460,227 +466,7 @@ DIRS += [ "/third_party/libwebrtc/webrtc_gn" ] @@ -62900,8 +63089,11 @@ index 78a668b8646e..69f69fa74b5e 100644 - "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn", - "/third_party/libwebrtc/modules/desktop_capture/primitives_gn", - "/third_party/libwebrtc/rtc_base/system/cocoa_threading_gn", +- "/third_party/libwebrtc/rtc_base/system/gcd_helpers_gn", - "/third_party/libwebrtc/sdk/base_objc_gn", -- "/third_party/libwebrtc/sdk/helpers_objc_gn" +- "/third_party/libwebrtc/sdk/helpers_objc_gn", +- "/third_party/libwebrtc/sdk/videocapture_objc_gn", +- "/third_party/libwebrtc/sdk/videoframebuffer_objc_gn" - ] - -if CONFIG["OS_TARGET"] == "OpenBSD": @@ -63105,7 +63297,7 @@ index 78a668b8646e..69f69fa74b5e 100644 DIRS += [ "/third_party/libwebrtc/common_audio/common_audio_neon_c_gn", -@@ -685,7 +474,7 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "WINNT": +@@ -688,7 +474,7 @@ if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "WINNT": "/third_party/libwebrtc/modules/video_processing/video_processing_neon_gn" ] @@ -63114,7 +63306,7 @@ index 78a668b8646e..69f69fa74b5e 100644 DIRS += [ "/third_party/libwebrtc/common_audio/common_audio_avx2_gn", -@@ -696,7 +485,7 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "WINNT": +@@ -699,7 +485,7 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "WINNT": "/third_party/libwebrtc/modules/video_processing/video_processing_sse2_gn" ] @@ -67675,10 +67867,10 @@ index b87d19dcfa02..79155a069937 100644 - DEFINES["_GNU_SOURCE"] = True - Library("field_trial_parser_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build -index d99945875231..8c5e660e2d89 100644 ---- third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build -+++ third_party/libwebrtc/rtc_base/experiments/jitter_upper_bound_experiment_gn/moz.build +diff --git third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build +index 4fc29dd00bdc..981a45f0db1c 100644 +--- third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build @@ -12,10 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -67867,11 +68059,11 @@ index d99945875231..8c5e660e2d89 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - - Library("jitter_upper_bound_experiment_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build -index 4fc29dd00bdc..981a45f0db1c 100644 ---- third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build -+++ third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build + Library("keyframe_interval_settings_experiment_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build +index eb804281b3b4..b1ca07bf3516 100644 +--- third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build @@ -12,10 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -68060,11 +68252,11 @@ index 4fc29dd00bdc..981a45f0db1c 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - - Library("keyframe_interval_settings_experiment_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build -index eb804281b3b4..b1ca07bf3516 100644 ---- third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build -+++ third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build + Library("min_video_bitrate_experiment_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build +index b1c8c0d0f5da..4161e1d2d4c4 100644 +--- third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build @@ -12,10 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -68253,11 +68445,11 @@ index eb804281b3b4..b1ca07bf3516 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - - Library("min_video_bitrate_experiment_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build -index b1c8c0d0f5da..4161e1d2d4c4 100644 ---- third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build -+++ third_party/libwebrtc/rtc_base/experiments/quality_rampup_experiment_gn/moz.build + Library("quality_rampup_experiment_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build +index e03ac53c529c..86fc14d049d4 100644 +--- third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build @@ -12,10 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -68446,11 +68638,11 @@ index b1c8c0d0f5da..4161e1d2d4c4 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - - Library("quality_rampup_experiment_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build -index e03ac53c529c..86fc14d049d4 100644 ---- third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build -+++ third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build + Library("quality_scaler_settings_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build +index 8eab3b601803..589003868373 100644 +--- third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build @@ -12,10 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -68639,11 +68831,11 @@ index e03ac53c529c..86fc14d049d4 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - - Library("quality_scaler_settings_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build -index 8eab3b601803..589003868373 100644 ---- third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build -+++ third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build + Library("quality_scaling_experiment_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build +index 0d2c512c84c9..0685f26b42d7 100644 +--- third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build @@ -12,10 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -68832,11 +69024,11 @@ index 8eab3b601803..589003868373 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - - Library("quality_scaling_experiment_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build -index 0d2c512c84c9..0685f26b42d7 100644 ---- third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build -+++ third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build + Library("rate_control_settings_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build +index a2d84caa9cb3..a279d9d22081 100644 +--- third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build @@ -12,10 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -69025,11 +69217,11 @@ index 0d2c512c84c9..0685f26b42d7 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - - Library("rate_control_settings_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build -index a2d84caa9cb3..a279d9d22081 100644 ---- third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build -+++ third_party/libwebrtc/rtc_base/experiments/rtt_mult_experiment_gn/moz.build + Library("rtt_mult_experiment_gn") +diff --git third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build +index 587c408000b8..d03c88253ad4 100644 +--- third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build ++++ third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build @@ -12,10 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -69218,11 +69410,11 @@ index a2d84caa9cb3..a279d9d22081 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - - Library("rtt_mult_experiment_gn") -diff --git third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build -index 587c408000b8..d03c88253ad4 100644 ---- third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build -+++ third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build + Library("stable_target_rate_experiment_gn") +diff --git third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build +index 1823f5043239..95ed70141a86 100644 +--- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build ++++ third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build @@ -12,10 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -69244,7 +69436,7 @@ index 587c408000b8..d03c88253ad4 100644 FINAL_LIBRARY = "webrtc" -@@ -41,165 +51,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -69263,10 +69455,6 @@ index 587c408000b8..d03c88253ad4 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -69332,10 +69520,6 @@ index 587c408000b8..d03c88253ad4 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -69345,10 +69529,6 @@ index 587c408000b8..d03c88253ad4 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True @@ -69411,11 +69591,11 @@ index 587c408000b8..d03c88253ad4 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - - Library("stable_target_rate_experiment_gn") -diff --git third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build -index 1823f5043239..95ed70141a86 100644 ---- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build -+++ third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build + Library("gtest_prod_gn") +diff --git third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build +index b4a901c6ef51..371cbfdafaa5 100644 +--- third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build ++++ third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build @@ -12,10 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -69437,7 +69617,7 @@ index 1823f5043239..95ed70141a86 100644 FINAL_LIBRARY = "webrtc" -@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -69456,6 +69636,10 @@ index 1823f5043239..95ed70141a86 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -69530,6 +69714,10 @@ index 1823f5043239..95ed70141a86 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True @@ -69592,11 +69780,105 @@ index 1823f5043239..95ed70141a86 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - - Library("gtest_prod_gn") -diff --git third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build -index b4a901c6ef51..371cbfdafaa5 100644 ---- third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build -+++ third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build + Library("histogram_percentile_counter_gn") +diff --git third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build +deleted file mode 100644 +index 404b7f5f924a..000000000000 +--- third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build ++++ /dev/null +@@ -1,88 +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["ANDROID"] = True +-DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" +-DEFINES["HAVE_SYS_UIO_H"] = True +-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True +-DEFINES["RTC_ENABLE_VP9"] = True +-DEFINES["WEBRTC_ANDROID"] = True +-DEFINES["WEBRTC_ANDROID_OPENSLES"] = True +-DEFINES["WEBRTC_ENABLE_AVX2"] = True +-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" +-DEFINES["WEBRTC_LIBRARY_IMPL"] = True +-DEFINES["WEBRTC_LINUX"] = True +-DEFINES["WEBRTC_MOZILLA_BUILD"] = True +-DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" +-DEFINES["WEBRTC_POSIX"] = True +-DEFINES["_GNU_SOURCE"] = True +-DEFINES["__STDC_CONSTANT_MACROS"] = True +-DEFINES["__STDC_FORMAT_MACROS"] = True +- +-FINAL_LIBRARY = "webrtc" +- +- +-LOCAL_INCLUDES += [ +- "!/ipc/ipdl/_ipdlheaders", +- "/ipc/chromium/src", +- "/third_party/libwebrtc/", +- "/third_party/libwebrtc/third_party/abseil-cpp/", +- "/tools/profiler/public" +-] +- +-OS_LIBS += [ +- "GLESv2", +- "log" +-] +- +-UNIFIED_SOURCES += [ +- "/third_party/libwebrtc/rtc_base/ifaddrs_android.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" +- DEFINES["_DEBUG"] = True +- +-if CONFIG["CPU_ARCH"] == "aarch64": +- +- DEFINES["WEBRTC_ARCH_ARM64"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +-if CONFIG["CPU_ARCH"] == "arm": +- +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- +- DEFINES["WEBRTC_ARCH_ARM"] = True +- DEFINES["WEBRTC_ARCH_ARM_V7"] = True +- DEFINES["WEBRTC_HAS_NEON"] = True +- +- OS_LIBS += [ +- "android_support", +- "unwind" +- ] +- +-if CONFIG["CPU_ARCH"] == "x86": +- +- OS_LIBS += [ +- "android_support" +- ] +- +-Library("ifaddrs_android_gn") +diff --git third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build +index 7b8ac423f8d1..fda3fcb7ee03 100644 +--- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build ++++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build @@ -12,10 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -69618,7 +69900,7 @@ index b4a901c6ef51..371cbfdafaa5 100644 FINAL_LIBRARY = "webrtc" -@@ -41,161 +51,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -69637,10 +69919,6 @@ index b4a901c6ef51..371cbfdafaa5 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -69715,10 +69993,6 @@ index b4a901c6ef51..371cbfdafaa5 100644 -if CONFIG["CPU_ARCH"] == "arm": - -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True @@ -69781,105 +70055,11 @@ index b4a901c6ef51..371cbfdafaa5 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - - Library("histogram_percentile_counter_gn") -diff --git third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build -deleted file mode 100644 -index 404b7f5f924a..000000000000 ---- third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build -+++ /dev/null -@@ -1,88 +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["ANDROID"] = True --DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1" --DEFINES["HAVE_SYS_UIO_H"] = True --DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True --DEFINES["RTC_ENABLE_VP9"] = True --DEFINES["WEBRTC_ANDROID"] = True --DEFINES["WEBRTC_ANDROID_OPENSLES"] = True --DEFINES["WEBRTC_ENABLE_AVX2"] = True --DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0" --DEFINES["WEBRTC_LIBRARY_IMPL"] = True --DEFINES["WEBRTC_LINUX"] = True --DEFINES["WEBRTC_MOZILLA_BUILD"] = True --DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0" --DEFINES["WEBRTC_POSIX"] = True --DEFINES["_GNU_SOURCE"] = True --DEFINES["__STDC_CONSTANT_MACROS"] = True --DEFINES["__STDC_FORMAT_MACROS"] = True -- --FINAL_LIBRARY = "webrtc" -- -- --LOCAL_INCLUDES += [ -- "!/ipc/ipdl/_ipdlheaders", -- "/ipc/chromium/src", -- "/third_party/libwebrtc/", -- "/third_party/libwebrtc/third_party/abseil-cpp/", -- "/tools/profiler/public" --] -- --OS_LIBS += [ -- "GLESv2", -- "log" --] -- --UNIFIED_SOURCES += [ -- "/third_party/libwebrtc/rtc_base/ifaddrs_android.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" -- DEFINES["_DEBUG"] = True -- --if CONFIG["CPU_ARCH"] == "aarch64": -- -- DEFINES["WEBRTC_ARCH_ARM64"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- --if CONFIG["CPU_ARCH"] == "arm": -- -- CXXFLAGS += [ -- "-mfpu=neon" -- ] -- -- DEFINES["WEBRTC_ARCH_ARM"] = True -- DEFINES["WEBRTC_ARCH_ARM_V7"] = True -- DEFINES["WEBRTC_HAS_NEON"] = True -- -- OS_LIBS += [ -- "android_support", -- "unwind" -- ] -- --if CONFIG["CPU_ARCH"] == "x86": -- -- OS_LIBS += [ -- "android_support" -- ] -- --Library("ifaddrs_android_gn") -diff --git third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build -index 7b8ac423f8d1..fda3fcb7ee03 100644 ---- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build -+++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build + Library("ignore_wundef_gn") +diff --git third_party/libwebrtc/rtc_base/ip_address_gn/moz.build third_party/libwebrtc/rtc_base/ip_address_gn/moz.build +index 686dd85e6761..fe2c7a08a1a8 100644 +--- third_party/libwebrtc/rtc_base/ip_address_gn/moz.build ++++ third_party/libwebrtc/rtc_base/ip_address_gn/moz.build @@ -12,10 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -69901,7 +70081,7 @@ index 7b8ac423f8d1..fda3fcb7ee03 100644 FINAL_LIBRARY = "webrtc" -@@ -37,153 +47,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -69920,6 +70100,11 @@ index 7b8ac423f8d1..fda3fcb7ee03 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - +- OS_LIBS += [ +- "GLESv2", +- "log" +- ] +- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -69985,6 +70170,13 @@ index 7b8ac423f8d1..fda3fcb7ee03 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True +- +- OS_LIBS += [ +- "crypt32", +- "iphlpapi", +- "secur32", +- "winmm" +- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -69994,6 +70186,10 @@ index 7b8ac423f8d1..fda3fcb7ee03 100644 -if CONFIG["CPU_ARCH"] == "arm": - +- CXXFLAGS += [ +- "-mfpu=neon" +- ] +- - DEFINES["WEBRTC_ARCH_ARM"] = True - DEFINES["WEBRTC_ARCH_ARM_V7"] = True - DEFINES["WEBRTC_HAS_NEON"] = True @@ -70056,11 +70252,11 @@ index 7b8ac423f8d1..fda3fcb7ee03 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - - Library("ignore_wundef_gn") -diff --git third_party/libwebrtc/rtc_base/ip_address_gn/moz.build third_party/libwebrtc/rtc_base/ip_address_gn/moz.build -index 686dd85e6761..fe2c7a08a1a8 100644 ---- third_party/libwebrtc/rtc_base/ip_address_gn/moz.build -+++ third_party/libwebrtc/rtc_base/ip_address_gn/moz.build + Library("ip_address_gn") +diff --git third_party/libwebrtc/rtc_base/location_gn/moz.build third_party/libwebrtc/rtc_base/location_gn/moz.build +index e5ccd52a24a3..61b1ea14bb0e 100644 +--- third_party/libwebrtc/rtc_base/location_gn/moz.build ++++ third_party/libwebrtc/rtc_base/location_gn/moz.build @@ -12,10 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True @@ -70082,7 +70278,7 @@ index 686dd85e6761..fe2c7a08a1a8 100644 FINAL_LIBRARY = "webrtc" -@@ -41,169 +51,15 @@ if not CONFIG["MOZ_DEBUG"]: +@@ -41,157 +51,15 @@ if not CONFIG["MOZ_DEBUG"]: if CONFIG["MOZ_DEBUG"] == "1": DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1" @@ -70101,11 +70297,6 @@ index 686dd85e6761..fe2c7a08a1a8 100644 - DEFINES["__STDC_CONSTANT_MACROS"] = True - DEFINES["__STDC_FORMAT_MACROS"] = True - -- OS_LIBS += [ -- "GLESv2", -- "log" -- ] -- -if CONFIG["OS_TARGET"] == "Darwin": - - DEFINES["WEBRTC_ENABLE_AVX2"] = True @@ -70171,13 +70362,6 @@ index 686dd85e6761..fe2c7a08a1a8 100644 - DEFINES["_WIN32_WINNT"] = "0x0A00" - DEFINES["_WINDOWS"] = True - DEFINES["__STD_C"] = True -- -- OS_LIBS += [ -- "crypt32", -- "iphlpapi", -- "secur32", -- "winmm" -- ] + DEFINES["_DEBUG"] = True if CONFIG["CPU_ARCH"] == "aarch64": @@ -70253,11 +70437,11 @@ index 686dd85e6761..fe2c7a08a1a8 100644 - DEFINES["WEBRTC_ENABLE_AVX2"] = True - DEFINES["_GNU_SOURCE"] = True - - Library("ip_address_gn") -diff --git third_party/libwebrtc/rtc_base/location_gn/moz.build third_party/libwebrtc/rtc_base/location_gn/moz.build -index e5ccd52a24a3..61b1ea14bb0e 100644 ---- third_party/libwebrtc/rtc_base/location_gn/moz.build -+++ third_party/libwebrtc/rtc_base/location_gn/moz.build + Library("location_gn") +diff --git third_party/libwebrtc/rtc_base/logging_gn/moz.build third_party/libwebrtc/rtc_base/logging_gn/moz.build +index 25c1b293e768..1ee3e013fdf4 100644 +--- third_party/libwebrtc/rtc_base/logging_gn/moz.build ++++ third_party/libwebrtc/rtc_base/logging_gn/moz.build @@ -12,10 +12,20 @@ AllowCompilerWarnings() DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1" DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True *** 4700 LINES SKIPPED ***