Skip to content

Commit

Permalink
Bug 1822194 - Vendor libwebrtc from 17887eb04a - moz.build file updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@mfromanmoz
mfromanmoz committed Apr 10, 2023
1 parent 036aa01 commit 61601f0
Show file tree
Hide file tree
Showing 22 changed files with 2 additions and 2,462 deletions.
2 changes: 1 addition & 1 deletion CLOBBER
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
# don't change CLOBBER for WebIDL changes any more.


Modified build files in third_party/libwebrtc - Bug 1822194 - (fix-acabb3641b) Break the new SetParametersCallback stuff into stand-alone files.
Modified build files in third_party/libwebrtc - Bug 1822194 - Vendor libwebrtc from 17887eb04a
48 changes: 0 additions & 48 deletions third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ if CONFIG["OS_TARGET"] == "Darwin":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_MAC"] = True
DEFINES["WEBRTC_POSIX"] = True
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
DEFINES["__STDC_CONSTANT_MACROS"] = True
Expand Down Expand Up @@ -103,8 +101,6 @@ if CONFIG["OS_TARGET"] == "OpenBSD":
DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_POSIX"] = True
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
DEFINES["_FILE_OFFSET_BITS"] = "64"
DEFINES["_LARGEFILE64_SOURCE"] = True
DEFINES["_LARGEFILE_SOURCE"] = True
Expand All @@ -120,8 +116,6 @@ if CONFIG["OS_TARGET"] == "WINNT":
DEFINES["UNICODE"] = True
DEFINES["USE_AURA"] = "1"
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
DEFINES["WEBRTC_WIN"] = True
DEFINES["WIN32"] = True
DEFINES["WIN32_LEAN_AND_MEAN"] = True
Expand Down Expand Up @@ -161,17 +155,6 @@ if CONFIG["CPU_ARCH"] == "arm":
DEFINES["WEBRTC_ARCH_ARM"] = True
DEFINES["WEBRTC_ARCH_ARM_V7"] = True
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0"

if CONFIG["CPU_ARCH"] == "ppc64":

DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"

OS_LIBS += [
"m"
]

if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":

Expand All @@ -197,11 +180,6 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":

DEFINES["USE_X11"] = "1"

if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":

DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"

if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":

OS_LIBS += [
Expand All @@ -215,29 +193,15 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
"-msse2"
]

DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"

OS_LIBS += [
"android_support"
]

if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":

DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"

if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":

DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
DEFINES["_GNU_SOURCE"] = True

OS_LIBS += [
"m"
]

if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":

DEFINES["WEBRTC_ENABLE_AVX2"] = True
Expand All @@ -250,23 +214,11 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
]

DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
DEFINES["_GNU_SOURCE"] = True

OS_LIBS += [
"m"
]

if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":

DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
DEFINES["_GNU_SOURCE"] = True

OS_LIBS += [
"m"
]

Library("builtin_audio_decoder_factory_gn")
48 changes: 0 additions & 48 deletions third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ if CONFIG["OS_TARGET"] == "Darwin":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_MAC"] = True
DEFINES["WEBRTC_POSIX"] = True
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
DEFINES["_LIBCPP_HAS_NO_ALIGNED_ALLOCATION"] = True
DEFINES["__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES"] = "0"
DEFINES["__STDC_CONSTANT_MACROS"] = True
Expand Down Expand Up @@ -103,8 +101,6 @@ if CONFIG["OS_TARGET"] == "OpenBSD":
DEFINES["WEBRTC_BSD"] = True
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_POSIX"] = True
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
DEFINES["_FILE_OFFSET_BITS"] = "64"
DEFINES["_LARGEFILE64_SOURCE"] = True
DEFINES["_LARGEFILE_SOURCE"] = True
Expand All @@ -120,8 +116,6 @@ if CONFIG["OS_TARGET"] == "WINNT":
DEFINES["UNICODE"] = True
DEFINES["USE_AURA"] = "1"
DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
DEFINES["WEBRTC_WIN"] = True
DEFINES["WIN32"] = True
DEFINES["WIN32_LEAN_AND_MEAN"] = True
Expand Down Expand Up @@ -161,17 +155,6 @@ if CONFIG["CPU_ARCH"] == "arm":
DEFINES["WEBRTC_ARCH_ARM"] = True
DEFINES["WEBRTC_ARCH_ARM_V7"] = True
DEFINES["WEBRTC_HAS_NEON"] = True
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "1"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "0"

if CONFIG["CPU_ARCH"] == "ppc64":

DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"

OS_LIBS += [
"m"
]

if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":

Expand All @@ -197,11 +180,6 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":

DEFINES["USE_X11"] = "1"

if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Android":

DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"

if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Android":

OS_LIBS += [
Expand All @@ -215,29 +193,15 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Android":
"-msse2"
]

DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"

OS_LIBS += [
"android_support"
]

if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Android":

DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"

if CONFIG["CPU_ARCH"] == "aarch64" and CONFIG["OS_TARGET"] == "Linux":

DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
DEFINES["_GNU_SOURCE"] = True

OS_LIBS += [
"m"
]

if CONFIG["CPU_ARCH"] == "arm" and CONFIG["OS_TARGET"] == "Linux":

DEFINES["WEBRTC_ENABLE_AVX2"] = True
Expand All @@ -250,23 +214,11 @@ if CONFIG["CPU_ARCH"] == "x86" and CONFIG["OS_TARGET"] == "Linux":
]

DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
DEFINES["_GNU_SOURCE"] = True

OS_LIBS += [
"m"
]

if CONFIG["CPU_ARCH"] == "x86_64" and CONFIG["OS_TARGET"] == "Linux":

DEFINES["WEBRTC_ENABLE_AVX2"] = True
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FIX"] = "0"
DEFINES["WEBRTC_USE_BUILTIN_ISAC_FLOAT"] = "1"
DEFINES["_GNU_SOURCE"] = True

OS_LIBS += [
"m"
]

Library("builtin_audio_encoder_factory_gn")
94 changes: 0 additions & 94 deletions third_party/libwebrtc/api/audio_codecs/isac/audio_decoder_isac_fix_gn/moz.build
View file

This file was deleted.

Loading

0 comments on commit 61601f0

Please sign in to comment.