13 files changed, 41 insertions, 2 deletions
diff --git a/media/libaom/moz.build b/media/libaom/moz.build
index 72d55cffe..aedac3102 100644
--- a/media/libaom/moz.build
+++ b/media/libaom/moz.build
@@ -88,6 +88,9 @@ else:
     LOCAL_INCLUDES += [ '/media/libaom/config/generic/' ]
     EXPORTS.aom += [ 'config/generic/config/aom_config.h' ]
 
+if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+    NO_VISIBILITY_FLAGS = True
+
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
diff --git a/media/libcubeb/src/moz.build b/media/libcubeb/src/moz.build
index b53dec799..65aaf7256 100644
--- a/media/libcubeb/src/moz.build
+++ b/media/libcubeb/src/moz.build
@@ -81,6 +81,9 @@ if CONFIG['OS_TARGET'] == 'Android':
     ]
     DEFINES['USE_AUDIOTRACK'] = True
 
+if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+    NO_VISIBILITY_FLAGS = True
+
 FINAL_LIBRARY = 'gkmedias'
 
 CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
diff --git a/media/libjpeg/moz.build b/media/libjpeg/moz.build
index 866830dad..6519c30fb 100644
--- a/media/libjpeg/moz.build
+++ b/media/libjpeg/moz.build
@@ -150,6 +150,9 @@ else: # No SIMD support?
 ASFLAGS += CONFIG['LIBJPEG_TURBO_ASFLAGS']
 ASFLAGS += ['-I%s/media/libjpeg/simd/' % TOPSRCDIR]
 
+if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+    NO_VISIBILITY_FLAGS = True
+
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
diff --git a/media/libmkv/moz.build b/media/libmkv/moz.build
index 2463bed86..018ca7474 100644
--- a/media/libmkv/moz.build
+++ b/media/libmkv/moz.build
@@ -20,6 +20,9 @@ SOURCES += [
     'WebMElement.c',
 ]
 
+if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+    NO_VISIBILITY_FLAGS = True
+
 FINAL_LIBRARY = 'gkmedias'
 
 # We allow warnings for third-party code that can be updated from upstream.
diff --git a/media/libnestegg/src/moz.build b/media/libnestegg/src/moz.build
index 541e18e04..bf9edcdbc 100644
--- a/media/libnestegg/src/moz.build
+++ b/media/libnestegg/src/moz.build
@@ -7,6 +7,9 @@ UNIFIED_SOURCES += [
     'nestegg.c',
 ]
 
+if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+    NO_VISIBILITY_FLAGS = True
+
 FINAL_LIBRARY = 'gkmedias'
 
 # We allow warnings for third-party code that can be updated from upstream.
diff --git a/media/libogg/moz.build b/media/libogg/moz.build
index a4745029e..abc8d0285 100644
--- a/media/libogg/moz.build
+++ b/media/libogg/moz.build
@@ -18,4 +18,7 @@ UNIFIED_SOURCES += [
     'src/ogg_framing.c',
 ]
 
+if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+    NO_VISIBILITY_FLAGS = True
+
 FINAL_LIBRARY = 'gkmedias'
diff --git a/media/libopus/moz.build b/media/libopus/moz.build
index 3c981e2aa..9ef394940 100644
--- a/media/libopus/moz.build
+++ b/media/libopus/moz.build
@@ -22,8 +22,10 @@ DEFINES['OPUS_BUILD'] = True
 DEFINES['OPUS_VERSION'] = '"v1.1.3-mozilla"'
 DEFINES['USE_ALLOCA'] = True
 
-# Don't export symbols
-DEFINES['OPUS_EXPORT'] = ''
+# We only need to export symbols if we're built into libgkmedias
+# instead of libxul.
+if not CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+    DEFINES['OPUS_EXPORT'] = ''
 
 if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_AS']:
     DEFINES['OPUS_ARM_ASM'] = True
diff --git a/media/libpng/moz.build b/media/libpng/moz.build
index 987c73745..ff4b9e9cb 100644
--- a/media/libpng/moz.build
+++ b/media/libpng/moz.build
@@ -46,6 +46,9 @@ if CONFIG['INTEL_ARCHITECTURE']:
 
 Library('mozpng')
 
+if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+    NO_VISIBILITY_FLAGS = True
+
 FINAL_LIBRARY = 'gkmedias'
 
 # We allow warnings for third-party code that can be updated from upstream.
diff --git a/media/libspeex_resampler/src/moz.build b/media/libspeex_resampler/src/moz.build
index cad566800..c8c8db653 100644
--- a/media/libspeex_resampler/src/moz.build
+++ b/media/libspeex_resampler/src/moz.build
@@ -22,7 +22,11 @@ FINAL_LIBRARY = 'gkmedias'
 # We don't compile the full speex codec, only the resampler.
 DEFINES['OUTSIDE_SPEEX'] = True
 
+# Visibility is handled through VISIBILITY_FLAGS and
+# layout/media/symbols.def.in.
 DEFINES['EXPORT'] = ''
+if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+    NO_VISIBILITY_FLAGS = True
 
 if CONFIG['MOZ_SAMPLE_TYPE_S16']:
     DEFINES['FIXED_POINT'] = True
diff --git a/media/libtheora/moz.build b/media/libtheora/moz.build
index 5fe30c60b..0a88d8f92 100644
--- a/media/libtheora/moz.build
+++ b/media/libtheora/moz.build
@@ -17,6 +17,9 @@ ALLOW_COMPILER_WARNINGS = True
 
 FINAL_LIBRARY = 'gkmedias'
 
+if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+    NO_VISIBILITY_FLAGS = True
+
 # The encoder is currently not included.
 DEFINES['THEORA_DISABLE_ENCODE'] = True
 
diff --git a/media/libvorbis/moz.build b/media/libvorbis/moz.build
index 1d42d5ff1..0bc180909 100644
--- a/media/libvorbis/moz.build
+++ b/media/libvorbis/moz.build
@@ -47,6 +47,9 @@ if CONFIG['OS_ARCH'] == 'AIX':
 if CONFIG['OS_ARCH'] == 'SunOS':
     DEFINES['HAVE_ALLOCA_H'] = True
 
+if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+    NO_VISIBILITY_FLAGS = True
+
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build
index 3e24eb14c..1630f6da4 100644
--- a/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -62,6 +62,9 @@ if 'vp8/encoder/arm/armv5te/boolhuff_armv5te.asm' not in arm_asm_files:
         'vp8/encoder/boolhuff.c',
     ]
 
+if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+    NO_VISIBILITY_FLAGS = True
+
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True
 
diff --git a/media/mtransport/build/moz.build b/media/mtransport/build/moz.build
index 4bac8210f..a5fdef5dd 100644
--- a/media/mtransport/build/moz.build
+++ b/media/mtransport/build/moz.build
@@ -32,4 +32,7 @@ include('../common.build')
 # nr_socket_short_term_violation_time.
 SOURCES += mtransport_cppsrcs
 
+if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+    NO_VISIBILITY_FLAGS = True
+
 FINAL_LIBRARY = 'xul'