From bc0c40c7b5820fe3645c30d6d4b400db629218da Mon Sep 17 00:00:00 2001 From: Michael Froman Date: Mon, 22 Aug 2022 03:04:43 -0500 Subject: [PATCH] Bug 1766646 - Vendor libwebrtc from 3a9e6877e5 - moz.build file updates --- CLOBBER | 2 +- third_party/libwebrtc/moz.build | 2 -- third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build | 4 ---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CLOBBER b/CLOBBER index cf37b6dfdf60..ea9d0d38b2f8 100644 --- a/CLOBBER +++ b/CLOBBER @@ -22,5 +22,5 @@ # 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 1766646 (MOZ) - update files in webrtc.json non_unified_sources +Modified build files in third_party/libwebrtc - Bug 1766646 - Vendor libwebrtc from 3a9e6877e5 diff --git a/third_party/libwebrtc/moz.build b/third_party/libwebrtc/moz.build index cd7f7d6bacad..60aff670156e 100644 --- a/third_party/libwebrtc/moz.build +++ b/third_party/libwebrtc/moz.build @@ -311,7 +311,6 @@ DIRS += [ "/third_party/libwebrtc/rtc_base/bit_buffer_gn", "/third_party/libwebrtc/rtc_base/bitstream_reader_gn", "/third_party/libwebrtc/rtc_base/buffer_gn", - "/third_party/libwebrtc/rtc_base/buffer_queue_gn", "/third_party/libwebrtc/rtc_base/byte_buffer_gn", "/third_party/libwebrtc/rtc_base/byte_order_gn", "/third_party/libwebrtc/rtc_base/callback_list_gn", @@ -379,7 +378,6 @@ DIRS += [ "/third_party/libwebrtc/rtc_base/socket_gn", "/third_party/libwebrtc/rtc_base/socket_server_gn", "/third_party/libwebrtc/rtc_base/stringutils_gn", - "/third_party/libwebrtc/rtc_base/strong_alias_gn", "/third_party/libwebrtc/rtc_base/swap_queue_gn", "/third_party/libwebrtc/rtc_base/synchronization/mutex_gn", "/third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn", diff --git a/third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build b/third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build index 80ec1cd0f583..edf479bd9153 100644 --- a/third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build +++ b/third_party/libwebrtc/rtc_base/rtc_base_approved_gn/moz.build @@ -52,10 +52,6 @@ if CONFIG["OS_TARGET"] == "Android": DEFINES["__STDC_CONSTANT_MACROS"] = True DEFINES["__STDC_FORMAT_MACROS"] = True - OS_LIBS += [ - "log" - ] - if CONFIG["OS_TARGET"] == "Darwin": DEFINES["WEBRTC_ENABLE_AVX2"] = True