From af68e1df4901b864f4639ba239328d23a88299b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Tue, 28 May 2024 16:14:47 +0000 Subject: [PATCH] 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 --- .../third_party_build/gn-configs/webrtc.json | 2 +- gfx/cairo/cairo/src/moz.build | 2 +- gfx/cairo/libpixman/src/moz.build | 2 +- gfx/graphite2/src/moz.build | 2 +- gfx/harfbuzz/src/moz.build | 2 +- gfx/ots/src/moz.build | 2 +- gfx/skia/generate_mozbuild.py | 2 +- gfx/skia/moz.build | 2 +- layout/media/moz.build | 27 ------------------- layout/media/webrtc/moz.build | 11 -------- layout/moz.build | 3 +-- media/highway/moz.build | 2 +- media/libcubeb/gtest/moz.build | 2 +- media/libcubeb/src/moz.build | 2 +- media/libdav1d/asm/moz.build | 2 +- media/libdav1d/moz.build | 2 +- media/libjpeg/jpeg12/moz.build | 2 +- media/libjpeg/jpeg16/moz.build | 2 +- media/libjpeg/moz.build | 2 +- media/libjxl/moz.build | 2 +- media/libmkv/moz.build | 2 +- media/libnestegg/src/moz.build | 2 +- media/libpng/moz.build | 2 +- media/libspeex_resampler/src/moz.build | 2 +- media/libwebp/moz.build | 2 +- media/libwebp/sharpyuv/moz.build | 2 +- media/libwebp/src/dec/moz.build | 2 +- media/libwebp/src/demux/moz.build | 2 +- media/libwebp/src/dsp/moz.build | 2 +- media/libwebp/src/enc/moz.build | 2 +- media/libwebp/src/moz/moz.build | 2 +- media/libwebp/src/utils/moz.build | 2 +- parser/expat/lib/moz.build | 2 +- 33 files changed, 31 insertions(+), 70 deletions(-) delete mode 100644 layout/media/moz.build delete mode 100644 layout/media/webrtc/moz.build diff --git a/dom/media/webrtc/third_party_build/gn-configs/webrtc.json b/dom/media/webrtc/third_party_build/gn-configs/webrtc.json index d1194046af83..15a5f4692013 100644 --- a/dom/media/webrtc/third_party_build/gn-configs/webrtc.json +++ b/dom/media/webrtc/third_party_build/gn-configs/webrtc.json @@ -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": { diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build index 7017c2e83f2c..78844a541b3a 100755 --- a/gfx/cairo/cairo/src/moz.build +++ b/gfx/cairo/cairo/src/moz.build @@ -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/"' diff --git a/gfx/cairo/libpixman/src/moz.build b/gfx/cairo/libpixman/src/moz.build index 6d5cee9c8de4..c5bff5db6dd6 100644 --- a/gfx/cairo/libpixman/src/moz.build +++ b/gfx/cairo/libpixman/src/moz.build @@ -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', ] diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build index 02fb5c3b0739..861cf52e398d 100755 --- a/gfx/graphite2/src/moz.build +++ b/gfx/graphite2/src/moz.build @@ -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' diff --git a/gfx/harfbuzz/src/moz.build b/gfx/harfbuzz/src/moz.build index 864c67db14cd..44de984650e0 100644 --- a/gfx/harfbuzz/src/moz.build +++ b/gfx/harfbuzz/src/moz.build @@ -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/"' diff --git a/gfx/ots/src/moz.build b/gfx/ots/src/moz.build index 03b046a6bcea..151d80af841d 100644 --- a/gfx/ots/src/moz.build +++ b/gfx/ots/src/moz.build @@ -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/"' diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py index 5862e4a5b5b6..b589efde1c5c 100755 --- a/gfx/skia/generate_mozbuild.py +++ b/gfx/skia/generate_mozbuild.py @@ -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', ] diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build index 104b2ce18b8d..7fee54534878 100644 --- a/gfx/skia/moz.build +++ b/gfx/skia/moz.build @@ -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', ] diff --git a/layout/media/moz.build b/layout/media/moz.build deleted file mode 100644 index 74f498ce4ebf..000000000000 --- a/layout/media/moz.build +++ /dev/null @@ -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", - ] diff --git a/layout/media/webrtc/moz.build b/layout/media/webrtc/moz.build deleted file mode 100644 index 567f9b640dcb..000000000000 --- a/layout/media/webrtc/moz.build +++ /dev/null @@ -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" diff --git a/layout/moz.build b/layout/moz.build index 62ccef291998..202f1e5575fe 100644 --- a/layout/moz.build +++ b/layout/moz.build @@ -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"] diff --git a/media/highway/moz.build b/media/highway/moz.build index a7ee01bf858c..13651cdd0248 100644 --- a/media/highway/moz.build +++ b/media/highway/moz.build @@ -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() diff --git a/media/libcubeb/gtest/moz.build b/media/libcubeb/gtest/moz.build index c4ee0724881b..3a03ad973ff8 100644 --- a/media/libcubeb/gtest/moz.build +++ b/media/libcubeb/gtest/moz.build @@ -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', diff --git a/media/libcubeb/src/moz.build b/media/libcubeb/src/moz.build index 46a89c40638f..fd6c6842a48d 100644 --- a/media/libcubeb/src/moz.build +++ b/media/libcubeb/src/moz.build @@ -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'] diff --git a/media/libdav1d/asm/moz.build b/media/libdav1d/asm/moz.build index e274e709bb7e..12b622710d05 100644 --- a/media/libdav1d/asm/moz.build +++ b/media/libdav1d/asm/moz.build @@ -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() diff --git a/media/libdav1d/moz.build b/media/libdav1d/moz.build index 821845c00e38..7496247eb51e 100644 --- a/media/libdav1d/moz.build +++ b/media/libdav1d/moz.build @@ -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() diff --git a/media/libjpeg/jpeg12/moz.build b/media/libjpeg/jpeg12/moz.build index 56340f077527..6b73cfbb647e 100644 --- a/media/libjpeg/jpeg12/moz.build +++ b/media/libjpeg/jpeg12/moz.build @@ -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' diff --git a/media/libjpeg/jpeg16/moz.build b/media/libjpeg/jpeg16/moz.build index f09fa3125fc1..583809947191 100644 --- a/media/libjpeg/jpeg16/moz.build +++ b/media/libjpeg/jpeg16/moz.build @@ -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' diff --git a/media/libjpeg/moz.build b/media/libjpeg/moz.build index 746a3fc4ad99..42206a19efd2 100644 --- a/media/libjpeg/moz.build +++ b/media/libjpeg/moz.build @@ -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' diff --git a/media/libjxl/moz.build b/media/libjxl/moz.build index 11469995e74a..886c2319ad60 100644 --- a/media/libjxl/moz.build +++ b/media/libjxl/moz.build @@ -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() diff --git a/media/libmkv/moz.build b/media/libmkv/moz.build index f58696d29f9e..e72512368402 100644 --- a/media/libmkv/moz.build +++ b/media/libmkv/moz.build @@ -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() diff --git a/media/libnestegg/src/moz.build b/media/libnestegg/src/moz.build index 71bea11fc3f1..971b44bf1156 100644 --- a/media/libnestegg/src/moz.build +++ b/media/libnestegg/src/moz.build @@ -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() diff --git a/media/libpng/moz.build b/media/libpng/moz.build index 35e34d287309..663eb929fe2a 100644 --- a/media/libpng/moz.build +++ b/media/libpng/moz.build @@ -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() diff --git a/media/libspeex_resampler/src/moz.build b/media/libspeex_resampler/src/moz.build index 1150722ca572..12736c867a56 100644 --- a/media/libspeex_resampler/src/moz.build +++ b/media/libspeex_resampler/src/moz.build @@ -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 diff --git a/media/libwebp/moz.build b/media/libwebp/moz.build index e10c6588a326..fc0da5c19dc6 100644 --- a/media/libwebp/moz.build +++ b/media/libwebp/moz.build @@ -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() diff --git a/media/libwebp/sharpyuv/moz.build b/media/libwebp/sharpyuv/moz.build index 3b498f0bf193..c45b9e1d4db3 100644 --- a/media/libwebp/sharpyuv/moz.build +++ b/media/libwebp/sharpyuv/moz.build @@ -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() diff --git a/media/libwebp/src/dec/moz.build b/media/libwebp/src/dec/moz.build index 95b30150add0..36725672cb3b 100644 --- a/media/libwebp/src/dec/moz.build +++ b/media/libwebp/src/dec/moz.build @@ -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() diff --git a/media/libwebp/src/demux/moz.build b/media/libwebp/src/demux/moz.build index ee1a76c4b4bc..9a735a880bbb 100644 --- a/media/libwebp/src/demux/moz.build +++ b/media/libwebp/src/demux/moz.build @@ -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() diff --git a/media/libwebp/src/dsp/moz.build b/media/libwebp/src/dsp/moz.build index a45db44c35c6..6383079c0d2e 100644 --- a/media/libwebp/src/dsp/moz.build +++ b/media/libwebp/src/dsp/moz.build @@ -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() diff --git a/media/libwebp/src/enc/moz.build b/media/libwebp/src/enc/moz.build index d10abfb03242..968a56451625 100644 --- a/media/libwebp/src/enc/moz.build +++ b/media/libwebp/src/enc/moz.build @@ -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() diff --git a/media/libwebp/src/moz/moz.build b/media/libwebp/src/moz/moz.build index 0dfea37ed33f..4bd714972450 100644 --- a/media/libwebp/src/moz/moz.build +++ b/media/libwebp/src/moz/moz.build @@ -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() diff --git a/media/libwebp/src/utils/moz.build b/media/libwebp/src/utils/moz.build index 2594c2493aa2..00c1c2ef686d 100644 --- a/media/libwebp/src/utils/moz.build +++ b/media/libwebp/src/utils/moz.build @@ -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() diff --git a/parser/expat/lib/moz.build b/parser/expat/lib/moz.build index f0301d37a07a..beaf8459b979 100644 --- a/parser/expat/lib/moz.build +++ b/parser/expat/lib/moz.build @@ -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