Bug 1766646 - Vendor libwebrtc from 16db7fff49 - moz.build file updates

This commit is contained in:
Michael Froman 2022-08-21 13:39:04 -05:00 коммит произвёл Connor Sheehan
Родитель dfc3fc0534
Коммит 0356359cac
4 изменённых файлов: 87 добавлений и 6 удалений

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

@ -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 e5d669ed28
Modified build files in third_party/libwebrtc - Bug 1766646 - Vendor libwebrtc from 16db7fff49

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

@ -413,7 +413,8 @@ if CONFIG["OS_TARGET"] == "WINNT":
"/third_party/libwebrtc/modules/audio_coding/isac_gn",
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_generic_gn",
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
"/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
"/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
"/third_party/libwebrtc/rtc_base/win32_gn"
]
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":

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

@ -152,7 +152,6 @@ if CONFIG["OS_TARGET"] == "WINNT":
DEFINES["WINAPI_FAMILY"] = "WINAPI_FAMILY_DESKTOP_APP"
DEFINES["WINVER"] = "0x0A00"
DEFINES["_ATL_NO_OPENGL"] = True
DEFINES["_CRT_NONSTDC_NO_DEPRECATE"] = True
DEFINES["_CRT_RAND_S"] = True
DEFINES["_CRT_SECURE_NO_DEPRECATE"] = True
DEFINES["_ENABLE_EXTENDED_ALIGNED_STORAGE"] = True
@ -173,9 +172,7 @@ if CONFIG["OS_TARGET"] == "WINNT":
]
UNIFIED_SOURCES += [
"/third_party/libwebrtc/rtc_base/win32.cc",
"/third_party/libwebrtc/rtc_base/win32_socket_server.cc",
"/third_party/libwebrtc/rtc_base/win32_window.cc"
"/third_party/libwebrtc/rtc_base/win32_socket_server.cc"
]
if CONFIG["CPU_ARCH"] == "aarch64":

83
third_party/libwebrtc/rtc_base/win32_gn/moz.build поставляемый Normal file
Просмотреть файл

@ -0,0 +1,83 @@
# 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["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
DEFINES["NOMINMAX"] = True
DEFINES["NTDDI_VERSION"] = "0x0A000000"
DEFINES["PSAPI_VERSION"] = "2"
DEFINES["RTC_ENABLE_VP9"] = True
DEFINES["UNICODE"] = True
DEFINES["USE_AURA"] = "1"
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_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_DEPRECATE"] = 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
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 += [
"crypt32",
"iphlpapi",
"secur32",
"winmm"
]
UNIFIED_SOURCES += [
"/third_party/libwebrtc/rtc_base/win32.cc",
"/third_party/libwebrtc/rtc_base/win32_window.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["_HAS_ITERATOR_DEBUGGING"] = "0"
if CONFIG["CPU_ARCH"] == "aarch64":
DEFINES["WEBRTC_ARCH_ARM64"] = True
DEFINES["WEBRTC_HAS_NEON"] = True
Library("win32_gn")