Bug 1747862 - regenerate webrtc moz.build files after bug 1744644. r=mjf

This commit is contained in:
Landry Breuil 2021-12-30 17:49:24 +01:00
parent f5c265c660
commit c3c633a1b1
3 changed files with 42 additions and 15 deletions

View File

@ -84,6 +84,17 @@ if CONFIG["OS_TARGET"] == "Linux":
DEFINES["__STDC_CONSTANT_MACROS"] = True
DEFINES["__STDC_FORMAT_MACROS"] = True
if CONFIG["OS_TARGET"] == "OpenBSD":
DEFINES["USE_GLIB"] = "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
@ -146,6 +157,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
DEFINES["_FORTIFY_SOURCE"] = "2"
if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
DEFINES["_FORTIFY_SOURCE"] = "2"
if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
DEFINES["_DEBUG"] = True
@ -158,6 +173,10 @@ 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"

View File

@ -84,6 +84,17 @@ if CONFIG["OS_TARGET"] == "Linux":
DEFINES["__STDC_CONSTANT_MACROS"] = True
DEFINES["__STDC_FORMAT_MACROS"] = True
if CONFIG["OS_TARGET"] == "OpenBSD":
DEFINES["USE_GLIB"] = "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
@ -146,6 +157,10 @@ if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "Linux":
DEFINES["_FORTIFY_SOURCE"] = "2"
if not CONFIG["MOZ_DEBUG"] and CONFIG["OS_TARGET"] == "OpenBSD":
DEFINES["_FORTIFY_SOURCE"] = "2"
if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
DEFINES["_DEBUG"] = True
@ -158,6 +173,10 @@ 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"

View File

@ -250,6 +250,8 @@ DIRS += [
"/third_party/libwebrtc/modules/video_capture/video_capture_module_gn",
"/third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn",
"/third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn",
"/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn",
"/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn",
"/third_party/libwebrtc/modules/video_coding/deprecated/nack_module_gn",
"/third_party/libwebrtc/modules/video_coding/encoded_frame_gn",
"/third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn",
@ -366,13 +368,6 @@ DIRS += [
"/third_party/libwebrtc/webrtc_gn"
]
if CONFIG["OS_TARGET"] == "Android":
DIRS += [
"/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn",
"/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn"
]
if CONFIG["OS_TARGET"] == "Darwin":
DIRS += [
@ -384,8 +379,6 @@ if CONFIG["OS_TARGET"] == "Darwin":
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn",
"/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
"/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_decoder_gn",
"/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn",
"/third_party/libwebrtc/rtc_base/system/cocoa_threading_gn",
"/third_party/libwebrtc/sdk/base_objc_gn",
"/third_party/libwebrtc/sdk/helpers_objc_gn"
@ -400,9 +393,7 @@ if CONFIG["OS_TARGET"] == "Linux":
"/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/video_coding/codecs/av1/libaom_av1_decoder_gn",
"/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn"
"/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
]
if CONFIG["OS_TARGET"] == "OpenBSD":
@ -431,9 +422,7 @@ 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/video_coding/codecs/av1/libaom_av1_decoder_gn",
"/third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn"
"/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
]
if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":