Bug 1898601 - Remove fake webrtc/gkmedias libs. r=glandium,media-playback-reviewers,webrtc-reviewers,cubeb-reviewers,pehrsons,padenot

The tests referenced by gkmedias were ported to gtest. The relevant
build file was removed bug 1357328.

Differential Revision: https://phabricator.services.mozilla.com/D211680
This commit is contained in:
Emilio Cobos Álvarez 2024-05-28 16:14:47 +00:00
parent c758f0801b
commit af68e1df49
33 changed files with 31 additions and 70 deletions

View File

@ -5,7 +5,7 @@
"COMPILE_FLAGS": {
"WARNINGS_AS_ERRORS": []
},
"FINAL_LIBRARY": "webrtc"
"FINAL_LIBRARY": "xul"
},
"mozilla_flags": ["-fobjc-arc", "-mavx2", "-mfma", "-mfpu=neon", "-msse2"],
"write_mozbuild_variables": {

View File

@ -211,7 +211,7 @@ UNIFIED_SOURCES += [
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
DEFINES['PACKAGE_VERSION'] = '"moz"'
DEFINES['PACKAGE_BUGREPORT'] = '"http://bugzilla.mozilla.org/"'

View File

@ -44,7 +44,7 @@ SOURCES += [
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../../cairo/src',
]

View File

@ -32,4 +32,4 @@ for k, v in graphite_defines:
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'

View File

@ -104,7 +104,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
DEFINES['PACKAGE_VERSION'] = '"moz"'
DEFINES['PACKAGE_BUGREPORT'] = '"http://bugzilla.mozilla.org/"'

View File

@ -65,7 +65,7 @@ UNIFIED_SOURCES += [
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
DEFINES['PACKAGE_VERSION'] = '"moz"'
DEFINES['PACKAGE_BUGREPORT'] = '"http://bugzilla.mozilla.org/"'

View File

@ -36,7 +36,7 @@ footer = """
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'skia',
]

View File

@ -564,7 +564,7 @@ if CONFIG['INTEL_ARCHITECTURE']:
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'skia',
]

View File

@ -1,27 +0,0 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# 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/.
with Files("**"):
BUG_COMPONENT = ("Core", "Audio/Video")
# media/webrtc/signaling/test/common.build uses the gkmedias library,
# expecting at least some of what it contains to be linked, but not libxul,
# so we need to keep an independent pseudo-library, as well as the OS_LIBS
# on Windows for them to propagate there.
Library("gkmedias")
FINAL_LIBRARY = "xul"
if CONFIG["MOZ_WEBRTC"]:
DIRS += ["webrtc"]
if CONFIG["OS_TARGET"] == "WINNT":
OS_LIBS += [
"usp10",
"ole32",
"msimg32",
"winmm",
]

View File

@ -1,11 +0,0 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# 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/.
with Files("**"):
BUG_COMPONENT = ("Core", "WebRTC")
Library("webrtc")
FINAL_LIBRARY = "xul"

View File

@ -10,6 +10,7 @@ with Files("**"):
DIRS += [
"style",
"base",
"build",
"generic",
"forms",
"tables",
@ -38,8 +39,6 @@ TEST_DIRS += [
"tools/reftest",
]
DIRS += ["build", "media"]
if CONFIG["MOZ_LAYOUT_DEBUGGER"] and CONFIG["MOZ_WIDGET_TOOLKIT"] != "android":
DIRS += ["tools/layout-debug"]

View File

@ -47,7 +47,7 @@ EXPORTS.hwy.ops += [
"/third_party/highway/hwy/ops/x86_512-inl.h",
]
FINAL_LIBRARY = "gkmedias"
FINAL_LIBRARY = "xul"
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()

View File

@ -58,7 +58,7 @@ else:
USE_LIBS += [
'cubeb',
]
# Don't link gkmedias for it introduces dependencies on Android.
# Don't link xul for it introduces dependencies on Android.
if CONFIG['OS_TARGET'] == 'Android':
USE_LIBS += [
'speex',

View File

@ -102,7 +102,7 @@ if CONFIG['MOZ_OPENSL']:
SOURCES += ['cubeb_opensl.cpp']
DEFINES['USE_OPENSL'] = True
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
if CONFIG['MOZ_ALSA']:
CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']

View File

@ -243,7 +243,7 @@ if CONFIG['TARGET_CPU'] in ('x86', 'x86_64'):
elif CONFIG['TARGET_CPU'] == 'aarch64' and CONFIG['OS_TARGET'] == 'WINNT':
USE_INTEGRATED_CLANGCL_AS = True
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()

View File

@ -210,7 +210,7 @@ if CONFIG['CC_TYPE'] == 'gcc':
LOCAL_INCLUDES += ['../../third_party/dav1d/include/compat/gcc/']
EXPORTS.dav1d += ['../../third_party/dav1d/include/compat/gcc/stdatomic.h']
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()

View File

@ -44,5 +44,5 @@ SOURCES += [
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'

View File

@ -31,5 +31,5 @@ SOURCES += [
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'

View File

@ -338,5 +338,5 @@ if CONFIG['TARGET_CPU'] == 'x86_64':
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'

View File

@ -114,7 +114,7 @@ EXPORTS.jxl += [
DEFINES["JPEGXL_ENABLE_BOXES"] = "0"
DEFINES["JPEGXL_ENABLE_TRANSCODE_JPEG"] = "0"
FINAL_LIBRARY = "gkmedias"
FINAL_LIBRARY = "xul"
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()

View File

@ -24,7 +24,7 @@ SOURCES += [
'WebMElement.c',
]
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()

View File

@ -8,7 +8,7 @@ UNIFIED_SOURCES += [
'nestegg.c',
]
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()

View File

@ -70,7 +70,7 @@ if CONFIG['MOZ_TREE_FREETYPE']:
Library('mozpng')
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()

View File

@ -18,7 +18,7 @@ SOURCES += [
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
# We don't compile the full speex codec, only the resampler.
DEFINES['OUTSIDE_SPEEX'] = True

View File

@ -26,7 +26,7 @@ DIRS += [
'src/utils',
]
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()

View File

@ -43,7 +43,7 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
# Add libFuzzer configuration directives
include('/tools/fuzzing/libfuzzer-config.mozbuild')
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()

View File

@ -24,7 +24,7 @@ LOCAL_INCLUDES += [
# Add libFuzzer configuration directives
include('/tools/fuzzing/libfuzzer-config.mozbuild')
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()

View File

@ -15,7 +15,7 @@ LOCAL_INCLUDES += [
# Add libFuzzer configuration directives
include('/tools/fuzzing/libfuzzer-config.mozbuild')
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()

View File

@ -111,7 +111,7 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'):
# Add libFuzzer configuration directives
include('/tools/fuzzing/libfuzzer-config.mozbuild')
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()

View File

@ -37,7 +37,7 @@ LOCAL_INCLUDES += [
# Add libFuzzer configuration directives
include('/tools/fuzzing/libfuzzer-config.mozbuild')
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()

View File

@ -15,7 +15,7 @@ LOCAL_INCLUDES += [
# Add libFuzzer configuration directives
include('/tools/fuzzing/libfuzzer-config.mozbuild')
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()

View File

@ -27,7 +27,7 @@ LOCAL_INCLUDES += [
# Add libFuzzer configuration directives
include('/tools/fuzzing/libfuzzer-config.mozbuild')
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
# We allow warnings for third-party code that can be updated from upstream.
AllowCompilerWarnings()

View File

@ -18,7 +18,7 @@ if CONFIG["MOZ_WASM_SANDBOXING_EXPAT"]:
else:
SOURCES += expat_sources
FINAL_LIBRARY = 'gkmedias'
FINAL_LIBRARY = 'xul'
for k, v in expat_defines:
DEFINES[k] = v