Bug 1766646 - Vendor libwebrtc from 09ceed2165 - moz.build file updates

This commit is contained in:
Michael Froman 2022-08-21 13:52:34 -05:00 коммит произвёл Connor Sheehan
Родитель a1d1e3433b
Коммит c83a263581
4 изменённых файлов: 385 добавлений и 1 удалений

Просмотреть файл

@ -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 - Vendor libwebrtc from 25b0dee820
Modified build files in third_party/libwebrtc - Bug 1766646 - Vendor libwebrtc from 09ceed2165

Просмотреть файл

@ -0,0 +1,179 @@
# 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["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"
FINAL_LIBRARY = "webrtc"
LOCAL_INCLUDES += [
"!/ipc/ipdl/_ipdlheaders",
"/ipc/chromium/src",
"/third_party/libwebrtc/",
"/third_party/libwebrtc/third_party/abseil-cpp/",
"/tools/profiler/public"
]
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":
DEFINES["ANDROID"] = True
DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_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["__STDC_CONSTANT_MACROS"] = True
DEFINES["__STDC_FORMAT_MACROS"] = True
if CONFIG["OS_TARGET"] == "Darwin":
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_X11"] = "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":
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_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
if CONFIG["CPU_ARCH"] == "aarch64":
DEFINES["WEBRTC_ARCH_ARM64"] = True
DEFINES["WEBRTC_HAS_NEON"] = True
if CONFIG["CPU_ARCH"] == "arm":
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":
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["_GNU_SOURCE"] = True
if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["_GNU_SOURCE"] = True
if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["_GNU_SOURCE"] = True
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["_GNU_SOURCE"] = True
Library("audio_frame_processor_gn")

Просмотреть файл

@ -0,0 +1,203 @@
# 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["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"
FINAL_LIBRARY = "webrtc"
LOCAL_INCLUDES += [
"!/ipc/ipdl/_ipdlheaders",
"/ipc/chromium/src",
"/third_party/libwebrtc/",
"/third_party/libwebrtc/third_party/abseil-cpp/",
"/tools/profiler/public"
]
UNIFIED_SOURCES += [
"/third_party/libwebrtc/modules/async_audio_processing/async_audio_processing.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":
DEFINES["ANDROID"] = True
DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r20_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["__STDC_CONSTANT_MACROS"] = True
DEFINES["__STDC_FORMAT_MACROS"] = True
OS_LIBS += [
"log"
]
if CONFIG["OS_TARGET"] == "Darwin":
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_X11"] = "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":
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_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
OS_LIBS += [
"winmm"
]
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":
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":
CXXFLAGS += [
"-msse2"
]
OS_LIBS += [
"android_support"
]
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["_GNU_SOURCE"] = True
if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["_GNU_SOURCE"] = True
if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
CXXFLAGS += [
"-msse2"
]
DEFINES["_GNU_SOURCE"] = True
if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":
DEFINES["_GNU_SOURCE"] = True
Library("async_audio_processing_gn")

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

@ -12,6 +12,7 @@ DIRS += [
"/third_party/libwebrtc/api/audio/aec3_config_gn",
"/third_party/libwebrtc/api/audio/aec3_factory_gn",
"/third_party/libwebrtc/api/audio/audio_frame_api_gn",
"/third_party/libwebrtc/api/audio/audio_frame_processor_gn",
"/third_party/libwebrtc/api/audio/audio_mixer_api_gn",
"/third_party/libwebrtc/api/audio/echo_control_gn",
"/third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn",
@ -143,6 +144,7 @@ DIRS += [
"/third_party/libwebrtc/media/rtc_media_config_gn",
"/third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn",
"/third_party/libwebrtc/media/rtc_vp9_profile_gn",
"/third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn",
"/third_party/libwebrtc/modules/audio_coding/audio_coding_gn",
"/third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn",
"/third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn",