Issue #61 - Reinstate buildability with shared gkmedias dll

This fully works for splitting gkmedias.dll back out from xul with one exception
which is Skia throwing undefined externals when linking gkmedias.

1 files changed, 12 insertions, 5 deletions

diff --git a/layout/media/moz.build b/layout/media/moz.build
index 8fd0eb9a8..9ea465319 100644
--- a/layout/media/moz.build
+++ b/layout/media/moz.build
@@ -6,16 +6,23 @@
 with Files('**'):
     BUG_COMPONENT = ('Core', 'Video/Audio')
 
-# 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')
+if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
+    GeckoSharedLibrary('gkmedias', linkage=None)
+    USE_LIBS += [
+        'nspr',
+    ]
+else:
+    # 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')
 
 if CONFIG['MOZ_WEBRTC']:
     DIRS += ['webrtc']
 
 if CONFIG['OS_TARGET'] == 'WINNT':
+    DEFFILE = 'symbols.def'
     OS_LIBS += [
         'usp10',
         'ole32',