Use generic multimedia libname for gkmedias

28 files changed, 30 insertions, 30 deletions

diff --git a/libs/angle/moz.build b/libs/angle/moz.build
index b9b12ece6..8d24292b7 100644
--- a/libs/angle/moz.build
+++ b/libs/angle/moz.build
@@ -176,11 +176,11 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
     NO_VISIBILITY_FLAGS = True
 
 # This tells ANGLE to build the translator with declspec(dllexport) on Windows
-# which we need to get these symbols exported from gremedia
+# which we need to get these symbols exported from multimedia
 DEFINES['COMPONENT_BUILD'] = True
 DEFINES['ANGLE_TRANSLATOR_IMPLEMENTATION'] = True
 
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
diff --git a/libs/brotli/moz.build b/libs/brotli/moz.build
index 13138adf7..615a0cde4 100644
--- a/libs/brotli/moz.build
+++ b/libs/brotli/moz.build
@@ -39,7 +39,7 @@ CFLAGS += ['-DBROTLI_BUILD_PORTABLE']
 
 Library('brotli')
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 HostProgram('brotli')
 
diff --git a/libs/cairo/moz.build b/libs/cairo/moz.build
index a33563c6d..efc64a248 100644
--- a/libs/cairo/moz.build
+++ b/libs/cairo/moz.build
@@ -199,4 +199,4 @@ LOCAL_INCLUDES += ['!src', 'src']
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
diff --git a/libs/expat/lib/moz.build b/libs/expat/lib/moz.build
index 2506972c6..4e9115eb6 100644
--- a/libs/expat/lib/moz.build
+++ b/libs/expat/lib/moz.build
@@ -14,6 +14,6 @@ SOURCES += [
     'xmltok.c',
 ]
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 DEFINES['HAVE_EXPAT_CONFIG_H'] = True
diff --git a/libs/graphite2/src/moz.build b/libs/graphite2/src/moz.build
index c90ba0827..ce1634e5f 100644
--- a/libs/graphite2/src/moz.build
+++ b/libs/graphite2/src/moz.build
@@ -68,7 +68,7 @@ else:
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 DEFINES['PACKAGE_VERSION'] = '"moz"'
 DEFINES['PACKAGE_BUGREPORT'] = '"http://bugzilla.mozilla.org/"'
diff --git a/libs/harfbuzz/src/moz.build b/libs/harfbuzz/src/moz.build
index 280fda3e6..3d9d98464 100644
--- a/libs/harfbuzz/src/moz.build
+++ b/libs/harfbuzz/src/moz.build
@@ -69,7 +69,7 @@ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 DEFINES['PACKAGE_VERSION'] = '"moz"'
 DEFINES['PACKAGE_BUGREPORT'] = '"http://bugzilla.mozilla.org/"'
diff --git a/libs/libaom/moz.build b/libs/libaom/moz.build
index abb72c203..c6e1a50db 100644
--- a/libs/libaom/moz.build
+++ b/libs/libaom/moz.build
@@ -85,7 +85,7 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 if CONFIG['CLANG_CL'] or not CONFIG['_MSC_VER']:
     for f in SOURCES:
diff --git a/libs/libcubeb/src/moz.build b/libs/libcubeb/src/moz.build
index 8f0635db2..a481ccffa 100644
--- a/libs/libcubeb/src/moz.build
+++ b/libs/libcubeb/src/moz.build
@@ -70,7 +70,7 @@ if CONFIG['OS_TARGET'] == 'WINNT':
 if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
     NO_VISIBILITY_FLAGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
 CFLAGS += CONFIG['MOZ_JACK_CFLAGS']
diff --git a/libs/libjpeg/moz.build b/libs/libjpeg/moz.build
index e3885b995..4fb884298 100644
--- a/libs/libjpeg/moz.build
+++ b/libs/libjpeg/moz.build
@@ -156,5 +156,5 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
diff --git a/libs/libmkv/moz.build b/libs/libmkv/moz.build
index 07e61bbbc..cb78219cb 100644
--- a/libs/libmkv/moz.build
+++ b/libs/libmkv/moz.build
@@ -23,7 +23,7 @@ SOURCES += [
 if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
     NO_VISIBILITY_FLAGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
diff --git a/libs/libnestegg/src/moz.build b/libs/libnestegg/src/moz.build
index f08d15d0f..dcfe117b5 100644
--- a/libs/libnestegg/src/moz.build
+++ b/libs/libnestegg/src/moz.build
@@ -10,7 +10,7 @@ UNIFIED_SOURCES += [
 if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
     NO_VISIBILITY_FLAGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
diff --git a/libs/libogg/moz.build b/libs/libogg/moz.build
index 948c74ea3..3b44aa230 100644
--- a/libs/libogg/moz.build
+++ b/libs/libogg/moz.build
@@ -21,4 +21,4 @@ UNIFIED_SOURCES += [
 if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
     NO_VISIBILITY_FLAGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
diff --git a/libs/libopus/moz.build b/libs/libopus/moz.build
index d8939d0fc..6bd177cc9 100644
--- a/libs/libopus/moz.build
+++ b/libs/libopus/moz.build
@@ -16,13 +16,13 @@ EXPORTS.opus += [
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 DEFINES['OPUS_BUILD'] = True
 DEFINES['OPUS_VERSION'] = '"v1.1.3-mozilla"'
 DEFINES['USE_ALLOCA'] = True
 
-# We only need to export symbols if we're built into libgremedia
+# We only need to export symbols if we're built into libmultimedia
 # instead of libxul.
 if not CONFIG['GKMEDIAS_SHARED_LIBRARY']:
     DEFINES['OPUS_EXPORT'] = ''
diff --git a/libs/libpixman/moz.build b/libs/libpixman/moz.build
index fe548e905..5c803d8fc 100644
--- a/libs/libpixman/moz.build
+++ b/libs/libpixman/moz.build
@@ -59,7 +59,7 @@ SOURCES += [
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 LOCAL_INCLUDES += ['../cairo/src']
 
 if CONFIG['MOZ_USE_PTHREADS']:
diff --git a/libs/libpng/moz.build b/libs/libpng/moz.build
index 913784c59..fb36bf465 100644
--- a/libs/libpng/moz.build
+++ b/libs/libpng/moz.build
@@ -49,7 +49,7 @@ Library('mozpng')
 if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
     NO_VISIBILITY_FLAGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
diff --git a/libs/libspeex_resampler/src/moz.build b/libs/libspeex_resampler/src/moz.build
index c8134c2b4..c97d44962 100644
--- a/libs/libspeex_resampler/src/moz.build
+++ b/libs/libspeex_resampler/src/moz.build
@@ -17,7 +17,7 @@ SOURCES += [
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 # We don't compile the full speex codec, only the resampler.
 DEFINES['OUTSIDE_SPEEX'] = True
diff --git a/libs/libtheora/moz.build b/libs/libtheora/moz.build
index 2f1d6f919..45718a3a2 100644
--- a/libs/libtheora/moz.build
+++ b/libs/libtheora/moz.build
@@ -15,7 +15,7 @@ EXPORTS.theora += [
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
     NO_VISIBILITY_FLAGS = True
diff --git a/libs/libtremor/lib/moz.build b/libs/libtremor/lib/moz.build
index b61b8b368..f56e2029e 100644
--- a/libs/libtremor/lib/moz.build
+++ b/libs/libtremor/lib/moz.build
@@ -18,7 +18,7 @@ SOURCES += [
     'tremor_window.c',
 ]
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 if CONFIG['OS_ARCH'] == 'AIX':
     DEFINES['alloca'] = '__alloca'
diff --git a/libs/libvorbis/moz.build b/libs/libvorbis/moz.build
index 4d3147e44..38625469f 100644
--- a/libs/libvorbis/moz.build
+++ b/libs/libvorbis/moz.build
@@ -53,7 +53,7 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 # Suppress warnings in third-party code.
 if CONFIG['GNU_CC']:
diff --git a/libs/libvpx/moz.build b/libs/libvpx/moz.build
index 0149a627b..95254ae01 100644
--- a/libs/libvpx/moz.build
+++ b/libs/libvpx/moz.build
@@ -63,7 +63,7 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 DEFINES['HAVE_CONFIG_H'] = 'vpx_config.h'
 
diff --git a/libs/libwebp/dec/moz.build b/libs/libwebp/dec/moz.build
index 78246111a..38531cee7 100644
--- a/libs/libwebp/dec/moz.build
+++ b/libs/libwebp/dec/moz.build
@@ -19,7 +19,7 @@ SOURCES += [
     'webp_dec.c',
 ]
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
diff --git a/libs/libwebp/demux/moz.build b/libs/libwebp/demux/moz.build
index 5422a7a25..a65984852 100644
--- a/libs/libwebp/demux/moz.build
+++ b/libs/libwebp/demux/moz.build
@@ -10,7 +10,7 @@ SOURCES += [
     'demux.c',
 ]
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
diff --git a/libs/libwebp/dsp/moz.build b/libs/libwebp/dsp/moz.build
index b8128dc13..566805bb0 100644
--- a/libs/libwebp/dsp/moz.build
+++ b/libs/libwebp/dsp/moz.build
@@ -56,7 +56,7 @@ elif CONFIG['INTEL_ARCHITECTURE']:
     SOURCES['yuv_sse2.c'].flags += CONFIG['SSE2_FLAGS']
     SOURCES['yuv_sse41.c'].flags += CONFIG['SSE2_FLAGS']
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
diff --git a/libs/libwebp/moz.build b/libs/libwebp/moz.build
index 9b61aa3df..2c9ab9b6f 100644
--- a/libs/libwebp/moz.build
+++ b/libs/libwebp/moz.build
@@ -21,7 +21,7 @@ DIRS += [
     'utils',
 ]
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
diff --git a/libs/libwebp/moz/moz.build b/libs/libwebp/moz/moz.build
index 80f7b9612..8733ba915 100644
--- a/libs/libwebp/moz/moz.build
+++ b/libs/libwebp/moz/moz.build
@@ -10,7 +10,7 @@ SOURCES += [
     'cpu.cpp',
 ]
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
diff --git a/libs/libwebp/utils/moz.build b/libs/libwebp/utils/moz.build
index a9c38f2d9..5d608365a 100644
--- a/libs/libwebp/utils/moz.build
+++ b/libs/libwebp/utils/moz.build
@@ -19,7 +19,7 @@ SOURCES += [
     'utils.c',
 ]
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
diff --git a/libs/ots/src/moz.build b/libs/ots/src/moz.build
index e5a8de68f..774a68dde 100644
--- a/libs/ots/src/moz.build
+++ b/libs/ots/src/moz.build
@@ -62,7 +62,7 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 DEFINES['PACKAGE_VERSION'] = '"moz"'
 DEFINES['PACKAGE_BUGREPORT'] = '"http://bugzilla.mozilla.org/"'
diff --git a/libs/qcms/moz.build b/libs/qcms/moz.build
index 32621977a..c3d693b1d 100644
--- a/libs/qcms/moz.build
+++ b/libs/qcms/moz.build
@@ -19,7 +19,7 @@ SOURCES += [
 if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
     NO_VISIBILITY_FLAGS = True
 
-FINAL_LIBRARY = 'gremedia'
+FINAL_LIBRARY = 'multimedia'
 
 if CONFIG['GNU_CC']:
     CFLAGS += ['-Wno-missing-field-initializers']