Bug 1216444 - Remove GKMEDIAS_SHARED_LIBRARY. r=mshal

In bug 922912, we folded back gkmedias.dll info xul.dll, so in practice, there is no default configuration left that exercises GKMEDIAS_SHARED_LIBRARY. And sure enough, it's been broken for months in many different ways. The gkmedias intermediate library is however kept for webrtc signaling tests.
rlr · Oct 21, 2015 · 3de00b4 · 3de00b4
1 parent 1b21276
commit 3de00b4
Show file tree

Hide file tree

Showing 32 changed files with 11 additions and 754 deletions.
diff --git a/b2g/installer/Makefile.in b/b2g/installer/Makefile.in
@@ -101,10 +101,6 @@ ifneq (,$(filter rtsp,$(NECKO_PROTOCOLS)))
 DEFINES += -DMOZ_RTSP
 endif
 
-ifdef GKMEDIAS_SHARED_LIBRARY
-DEFINES += -DGKMEDIAS_SHARED_LIBRARY
-endif
-
 DEFINES += -DMOZ_ICU_VERSION=$(MOZ_ICU_VERSION)
 ifdef MOZ_NATIVE_ICU
 DEFINES += -DMOZ_NATIVE_ICU

diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
@@ -44,9 +44,6 @@
 
 [xpcom]
 @RESPATH@/dependentlibs.list
-#ifdef GKMEDIAS_SHARED_LIBRARY
-@BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
-#endif
 #ifndef MOZ_STATIC_JS
 @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@
 #endif

diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
@@ -84,10 +84,6 @@ ifdef NECKO_WIFI
 DEFINES += -DNECKO_WIFI
 endif
 
-ifdef GKMEDIAS_SHARED_LIBRARY
-DEFINES += -DGKMEDIAS_SHARED_LIBRARY
-endif
-
 ifdef MAKENSISU
 DEFINES += -DHAVE_MAKENSISU=1
 endif

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
@@ -63,9 +63,6 @@
 
 [xpcom]
 @RESPATH@/dependentlibs.list
-#ifdef GKMEDIAS_SHARED_LIBRARY
-@BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
-#endif
 #ifdef MOZ_SHARED_MOZGLUE
 @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@
 #endif

diff --git a/config/moz.build b/config/moz.build
@@ -26,9 +26,6 @@ if CONFIG['HOST_OS_ARCH'] != 'WINNT':
     ]
     HostProgram('nsinstall_real')
 
-if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
-    DEFINES['GKMEDIAS_SHARED_LIBRARY'] = True
-
 if CONFIG['MOZ_SHARED_ICU']:
     DEFINES['MOZ_SHARED_ICU'] = True
 

diff --git a/config/system-headers b/config/system-headers
@@ -1313,22 +1313,6 @@ vpx/vp8cx.h
 vpx/vp8dx.h
 vpx_mem/vpx_mem.h
 #endif
-#ifdef GKMEDIAS_SHARED_LIBRARY
-vpx/vpx_codec.h
-vpx/vpx_decoder.h
-vpx/vpx_encoder.h
-vpx/vp8cx.h
-vpx/vp8dx.h
-vpx_mem/vpx_mem.h
-vorbis/codec.h
-theora/theoradec.h
-tremor/ivorbiscodec.h
-speex/speex_resampler.h
-ogg/ogg.h
-ogg/os_types.h
-nestegg/nestegg.h
-cubeb/cubeb.h
-#endif
 gst/gst.h
 gst/app/gstappsink.h
 gst/app/gstappsrc.h

diff --git a/configure.in b/configure.in
@@ -7992,13 +7992,8 @@ dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Static build options)
 
-if test -n "$GKMEDIAS_SHARED_LIBRARY"; then
-  AC_DEFINE(GKMEDIAS_SHARED_LIBRARY)
-fi
-AC_SUBST(GKMEDIAS_SHARED_LIBRARY)
-
 if test -z "$MOZ_NATIVE_ZLIB"; then
-if test -n "$JS_SHARED_LIBRARY" -o "$GKMEDIAS_SHARED_LIBRARY"; then
+if test -n "$JS_SHARED_LIBRARY"; then
   ZLIB_IN_MOZGLUE=1
   AC_DEFINE(ZLIB_IN_MOZGLUE)
 fi

diff --git a/dom/media/gmp/moz.build b/dom/media/gmp/moz.build
@@ -127,9 +127,6 @@ IPDL_SOURCES += [
   'PGMPVideoEncoder.ipdl',
 ]
 
-if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
-    NO_VISIBILITY_FLAGS = True
-
 # comment this out to use Unsafe Shmem for more performance
 DEFINES['GMP_SAFE_SHMEM'] = True
 

diff --git a/gfx/angle/moz.build b/gfx/angle/moz.build
@@ -152,14 +152,6 @@ EXPORTS.angle.KHR += [ 'include/KHR/khrplatform.h' ]
 
 LOCAL_INCLUDES += [ 'include', 'src' ]
 
-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 gkmedias
-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
 

diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build
@@ -59,13 +59,9 @@ UNIFIED_SOURCES += [
     'UtfCodec.cpp',
 ]
 
-if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
-    NO_VISIBILITY_FLAGS = True
-    DEFINES['GRAPHITE2_EXPORTING'] = True
-else:
-    # tell graphite2 not to export symbols, we'll be linking it directly with
-    # thebes
-    DEFINES['GRAPHITE2_STATIC'] = True
+# tell graphite2 not to export symbols, we'll be linking it directly with
+# thebes
+DEFINES['GRAPHITE2_STATIC'] = True
 
 # We allow warnings for third-party code that can be updated from upstream.
 ALLOW_COMPILER_WARNINGS = True

diff --git a/gfx/ots/src/moz.build b/gfx/ots/src/moz.build
@@ -47,9 +47,6 @@ UNIFIED_SOURCES += [
     'woff2.cc',
 ]
 
-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
 
@@ -58,10 +55,6 @@ FINAL_LIBRARY = 'gkmedias'
 DEFINES['PACKAGE_VERSION'] = '"moz"'
 DEFINES['PACKAGE_BUGREPORT'] = '"http://bugzilla.mozilla.org/"'
 
-if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
-    DEFINES['OTS_DLL'] = True
-    DEFINES['OTS_DLL_EXPORTS'] = True
-
 USE_LIBS += [
     'brotli',
 ]
diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
@@ -96,10 +96,6 @@
   } or CONFIG['MOZ_WIDGET_GTK']:
     DEFINES['SK_FONTHOST_DOES_NOT_USE_FONTMGR'] = 1
 
-if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
-    DEFINES['SKIA_DLL'] = 1
-    DEFINES['GR_DLL'] = 1
-
 # We should autogenerate these SSE related flags.
 
 if CONFIG['_MSC_VER']:

diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
@@ -625,10 +625,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
 if (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android') or    (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa') or (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit') or    (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk') or    (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt') or    CONFIG['MOZ_WIDGET_GTK']:
     DEFINES['SK_FONTHOST_DOES_NOT_USE_FONTMGR'] = 1
 
-if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
-    DEFINES['SKIA_DLL'] = 1
-    DEFINES['GR_DLL'] = 1
-
 # We should autogenerate these SSE related flags.
 
 if CONFIG['_MSC_VER']:

diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build
@@ -306,8 +306,5 @@ LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
 
 DEFINES['GRAPHITE2_STATIC'] = True
 
-if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
-    DEFINES['OTS_DLL'] = True
-
 if CONFIG['OS_ARCH'] == 'WINNT':
     del DEFINES['UNICODE']
diff --git a/layout/media/Makefile.in b/layout/media/Makefile.in
diff --git a/layout/media/moz.build b/layout/media/moz.build
@@ -7,20 +7,16 @@
 with Files('**'):
     BUG_COMPONENT = ('Core', 'Video/Audio')
 
-if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
-    GeckoSharedLibrary('gkmedias', linkage=None)
-    USE_LIBS += [
-        'nspr',
-    ]
-else:
-    Library('gkmedias')
-
+# 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',