зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1766646 - (fix-8615bf0582) restrict deps in frame_buffer_unittest - moz.build file updates
This commit is contained in:
Michael Froman
Connor Sheehan
Родитель
e233cd5ad4
Коммит
0e24f26f7c
2
CLOBBER
2
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 - Vendor libwebrtc from 26d12fcc71
|
||||
Modified build files in third_party/libwebrtc - Bug 1766646 - (fix-8615bf0582) restrict deps in frame_buffer_unittest
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,214 @@
|
|||
# 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_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"
|
||||
|
||||
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/api/video/frame_buffer.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"] = "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 += [
|
||||
"GLESv2",
|
||||
"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
|
||||
|
||||
OS_LIBS += [
|
||||
"dl",
|
||||
"rt"
|
||||
]
|
||||
|
||||
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
|
||||
|
||||
OS_LIBS += [
|
||||
"crypt32",
|
||||
"iphlpapi",
|
||||
"secur32",
|
||||
"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":
|
||||
|
||||
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_buffer_gn")
|
||||
|
|
@ -84,6 +84,7 @@ DIRS += [
|
|||
"/third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn",
|
||||
"/third_party/libwebrtc/api/video/encoded_frame_gn",
|
||||
"/third_party/libwebrtc/api/video/encoded_image_gn",
|
||||
"/third_party/libwebrtc/api/video/frame_buffer_gn",
|
||||
"/third_party/libwebrtc/api/video/recordable_encoded_frame_gn",
|
||||
"/third_party/libwebrtc/api/video/render_resolution_gn",
|
||||
"/third_party/libwebrtc/api/video/video_adaptation_gn",
|
||||
|
|
@ -279,7 +280,6 @@ DIRS += [
|
|||
"/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn",
|
||||
"/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_if_supported_gn",
|
||||
"/third_party/libwebrtc/modules/video_coding/encoded_frame_gn",
|
||||
"/third_party/libwebrtc/modules/video_coding/frame_buffer_gn",
|
||||
"/third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn",
|
||||
"/third_party/libwebrtc/modules/video_coding/frame_helpers_gn",
|
||||
"/third_party/libwebrtc/modules/video_coding/inter_frame_delay_gn",
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче