Bug 914245 - Move FORCE_SHARED_LIB to moz.build. r=mshal

2013-11-19 11:47:45 +09:00 · 2013-11-19 11:47:45 +09:00 · b2e90f6233
--- a/accessible/public/ia2/Makefile.in
+++ b/accessible/public/ia2/Makefile.in
@ -10,8 +10,6 @@ DEFINES       += -DREGISTER_PROXY_DLL

 GARBAGE       += $(MIDL_GENERATED_FILES)

-FORCE_SHARED_LIB = 1
-
 # Please keep this list in sync with the moz.build file until the rest of this
 # Makefile is ported over.
 MIDL_INTERFACES = \
--- a/accessible/public/ia2/moz.build
+++ b/accessible/public/ia2/moz.build
@ -6,3 +6,4 @@

 LIBRARY_NAME = 'IA2Marshal'

+FORCE_SHARED_LIB = True
--- a/accessible/public/msaa/Makefile.in
+++ b/accessible/public/msaa/Makefile.in
@ -8,8 +8,6 @@ DEFINES += -DREGISTER_PROXY_DLL

 GARBAGE += $(MIDL_GENERATED_FILES) done_gen dlldata.c

-FORCE_SHARED_LIB = 1
-
 MIDL_GENERATED_FILES = \
 	ISimpleDOMNode.h \
 	ISimpleDOMNode_p.c \
--- a/accessible/public/msaa/moz.build
+++ b/accessible/public/msaa/moz.build
@ -15,3 +15,5 @@ GENERATED_SOURCES += [
    'ISimpleDOMText_i.c',
    'ISimpleDOMText_p.c',
 ]
+
+FORCE_SHARED_LIB = True
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@ -4,7 +4,6 @@

 SHORT_LIBNAME = brwsrcmp
 MODULE_NAME = nsBrowserCompsModule
-FORCE_SHARED_LIB = 1

 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS	+= $(call EXPAND_LIBNAME,ole32 shell32 shlwapi)
--- a/browser/components/build/moz.build
+++ b/browser/components/build/moz.build
@ -16,3 +16,4 @@ LIBRARY_NAME = 'browsercomps'

 IS_COMPONENT = True

+FORCE_SHARED_LIB = True
--- a/build/win32/crashinjectdll/Makefile.in
+++ b/build/win32/crashinjectdll/Makefile.in
@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 DEFFILE = $(srcdir)/crashinjectdll.def
-FORCE_SHARED_LIB = 1
 USE_STATIC_LIBS = 1

 MOZ_GLUE_LDFLAGS =
--- a/build/win32/crashinjectdll/moz.build
+++ b/build/win32/crashinjectdll/moz.build
@ -10,3 +10,4 @@ SOURCES += [

 LIBRARY_NAME = 'crashinjectdll'

+FORCE_SHARED_LIB = True
--- a/build/win32/vmwarerecordinghelper/Makefile.in
+++ b/build/win32/vmwarerecordinghelper/Makefile.in
@ -4,7 +4,6 @@

 DEFFILE = $(srcdir)/$(LIBRARY_NAME).def

-FORCE_SHARED_LIB = 1
 USE_STATIC_LIBS = 1

 MOZ_GLUE_LDFLAGS =
--- a/build/win32/vmwarerecordinghelper/moz.build
+++ b/build/win32/vmwarerecordinghelper/moz.build
@ -10,3 +10,4 @@ SOURCES += [

 LIBRARY_NAME = 'vmwarerecordinghelper'

+FORCE_SHARED_LIB = True
--- a/config/config.mk
+++ b/config/config.mk
@ -42,6 +42,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
  DIRS \
  EXTRA_PP_COMPONENTS \
  EXTRA_PP_JS_MODULES \
+  FORCE_SHARED_LIB \
  FORCE_STATIC_LIB \
  GTEST_CMMSRCS \
  GTEST_CPPSRCS \
--- a/db/sqlite3/src/Makefile.in
+++ b/db/sqlite3/src/Makefile.in
@ -4,9 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 SHORT_LIBNAME    = mozsqlt3
-ifndef MOZ_FOLD_LIBS
-FORCE_SHARED_LIB = 1
-endif
 LIB_IS_C_ONLY    = 1

 ifeq ($(OS_ARCH),WINNT)
--- a/db/sqlite3/src/moz.build
+++ b/db/sqlite3/src/moz.build
@ -17,3 +17,5 @@ SOURCES += [

 if CONFIG['MOZ_FOLD_LIBS']:
    FORCE_STATIC_LIB = True
+else:
+    FORCE_SHARED_LIB = True
--- a/dom/plugins/ipc/interpose/Makefile.in
+++ b/dom/plugins/ipc/interpose/Makefile.in
@ -2,7 +2,6 @@
 # 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/.

-FORCE_SHARED_LIB = 1
 DIST_INSTALL     = 1


--- a/dom/plugins/ipc/interpose/moz.build
+++ b/dom/plugins/ipc/interpose/moz.build
@ -11,3 +11,5 @@ SOURCES += [ "%s.mm" % (LIBRARY_NAME) ]
 SOURCES += [
    'plugin_child_quirks.mm',
 ]
+
+FORCE_SHARED_LIB = True
--- a/dom/plugins/test/testplugin/testplugin.mk
+++ b/dom/plugins/test/testplugin/testplugin.mk
@ -3,8 +3,6 @@
 # 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/.

-FORCE_SHARED_LIB = 1
-
 # Don't use STL wrappers; nptest isn't Gecko code
 STL_FLAGS =

--- a/dom/plugins/test/testplugin/testplugin.mozbuild
+++ b/dom/plugins/test/testplugin/testplugin.mozbuild
@ -40,3 +40,5 @@ elif toolkit == 'windows':
    SOURCES += [
        relative_path + '/nptest_windows.cpp',
    ]
+
+FORCE_SHARED_LIB = True
--- a/extensions/gnomevfs/Makefile.in
+++ b/extensions/gnomevfs/Makefile.in
@ -12,8 +12,3 @@ EXTRA_DSO_LDOPTS = \
 		   $(NSPR_LIBS) \
 		   $(MOZ_GNOMEVFS_LIBS) \
 		   $(NULL)
-
-# make sure this component is never statically linked into the main
-# application.  this is necessary since we don't want to force users
-# to install gnome-vfs2 in order to use the rest of mozilla ;-)
-FORCE_SHARED_LIB= 1
--- a/extensions/gnomevfs/moz.build
+++ b/extensions/gnomevfs/moz.build
@ -12,3 +12,7 @@ LIBRARY_NAME = 'nkgnomevfs'

 IS_COMPONENT = True

+# make sure this component is never statically linked into the main
+# application.  this is necessary since we don't want to force users
+# to install gnome-vfs2 in order to use the rest of mozilla ;-)
+FORCE_SHARED_LIB = True
--- a/extensions/widgetutils/src/Makefile.in
+++ b/extensions/widgetutils/src/Makefile.in
@ -4,7 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 SHORT_LIBNAME = widgetutils
-FORCE_SHARED_LIB = 1

 EXTRA_DSO_LDOPTS = \
  $(XPCOM_GLUE_LDOPTS) \
--- a/extensions/widgetutils/src/moz.build
+++ b/extensions/widgetutils/src/moz.build
@ -16,3 +16,5 @@ XPI_NAME = 'widgetutils'

 if CONFIG['TARGET_XPCOM_ABI']:
    FINAL_TARGET += '/platform/%(OS_TARGET)s_%(TARGET_XPCOM_ABI)s' % CONFIG
+
+FORCE_SHARED_LIB = True
--- a/gfx/angle/src/libEGL/Makefile.in
+++ b/gfx/angle/src/libEGL/Makefile.in
@ -2,9 +2,6 @@
 # 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/.

-# On Windows, we don't automatically get "lib" prepended, but we need it.
-FORCE_SHARED_LIB = 1
-
 # ANGLE uses the STL, so we can't use our derpy STL wrappers.
 STL_FLAGS =

--- a/gfx/angle/src/libEGL/moz.build
+++ b/gfx/angle/src/libEGL/moz.build
@ -21,4 +21,7 @@ SOURCES += [
    'Surface.cpp',
 ]

+# On Windows, we don't automatically get "lib" prepended, but we need it.
 LIBRARY_NAME = 'libEGL'
+
+FORCE_SHARED_LIB = True
--- a/gfx/angle/src/libGLESv2/Makefile.in
+++ b/gfx/angle/src/libGLESv2/Makefile.in
@ -2,9 +2,6 @@
 # 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/.

-# On Windows, we don't automatically get "lib" prepended, but we need it.
-FORCE_SHARED_LIB = 1
-
 # ANGLE uses the STL, so we can't use our derpy STL wrappers.
 STL_FLAGS =

--- a/gfx/angle/src/libGLESv2/moz.build
+++ b/gfx/angle/src/libGLESv2/moz.build
@ -175,4 +175,7 @@ SOURCES += ['renderer/' + src for src in [
    'VertexDeclarationCache.cpp',
 ]]

+# On Windows, we don't automatically get "lib" prepended, but we need it.
 LIBRARY_NAME = 'libGLESv2'
+
+FORCE_SHARED_LIB = True
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@ -20,17 +20,6 @@ run_for_side_effects := $(shell echo "MAKE: $(MAKE)")
 STATIC_LIBRARY_NAME = js_static
 LIBS		= $(NSPR_LIBS)

-# JavaScript must be built shared, even for static builds, as it is used by
-# other modules which are always built shared. Failure to do so results in
-# the js code getting copied into xpinstall and jsd as well as mozilla-bin,
-# and then the static data cells used for locking no longer work.
-#
-# In fact, we now build both a static and a shared library, as the
-# JS shell would like to link to the static library.
-
-ifdef JS_SHARED_LIBRARY
-FORCE_SHARED_LIB = 1
-endif
 DIST_INSTALL = 1

 VPATH		+= \
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@ -42,6 +42,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
  DIRS \
  EXTRA_PP_COMPONENTS \
  EXTRA_PP_JS_MODULES \
+  FORCE_SHARED_LIB \
  FORCE_STATIC_LIB \
  GTEST_CMMSRCS \
  GTEST_CPPSRCS \
--- a/js/src/moz.build
+++ b/js/src/moz.build
@ -371,4 +371,15 @@ HOST_SIMPLE_PROGRAMS += [
    'host_%s' % f.replace('.cpp', '') for f in HOST_SOURCES
 ]

+# JavaScript must be built shared, even for static builds, as it is used by
+# other modules which are always built shared. Failure to do so results in
+# the js code getting copied into xpinstall and jsd as well as mozilla-bin,
+# and then the static data cells used for locking no longer work.
+#
+# In fact, we now build both a static and a shared library, as the
+# JS shell would like to link to the static library.
+
+if CONFIG['JS_SHARED_LIBRARY']:
+    FORCE_SHARED_LIB = True
+
 FORCE_STATIC_LIB = True
--- a/js/xpconnect/tests/components/native/Makefile.in
+++ b/js/xpconnect/tests/components/native/Makefile.in
@ -4,7 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 MODULE_NAME = xpconnect_test
-FORCE_SHARED_LIB = 1

 componentdir = js/xpconnect/tests/components/native

--- a/js/xpconnect/tests/components/native/moz.build
+++ b/js/xpconnect/tests/components/native/moz.build
@ -16,3 +16,4 @@ LIBRARY_NAME = 'xpctest'

 IS_COMPONENT = True

+FORCE_SHARED_LIB = True
--- a/layout/media/Makefile.in
+++ b/layout/media/Makefile.in
@ -4,9 +4,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 EXPORT_LIBRARY	= $(DIST)/lib
-ifeq (WINNT,$(OS_TARGET))
-FORCE_SHARED_LIB = 1
-endif

 ifeq (WINNT,$(OS_TARGET))
 EXTRA_DSO_LDOPTS = $(MOZALLOC_LIB) $(NSPR_LIBS)
--- a/layout/media/moz.build
+++ b/layout/media/moz.build
@ -6,5 +6,8 @@

 LIBRARY_NAME = 'gkmedias'

+if CONFIG['OS_TARGET'] == 'WINNT':
+    FORCE_SHARED_LIB = True
+
 if CONFIG['MOZ_WEBRTC']:
    DIRS += ['webrtc']
--- a/media/omx-plugin/Makefile.in
+++ b/media/omx-plugin/Makefile.in
@ -13,7 +13,6 @@
 # limitations under the License.

 MODULE_NAME = omxplugin
-FORCE_SHARED_LIB = 1

 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
--- a/media/omx-plugin/froyo/Makefile.in
+++ b/media/omx-plugin/froyo/Makefile.in
@ -13,7 +13,6 @@
 # limitations under the License.

 MODULE_NAME = omxpluginfroyo
-FORCE_SHARED_LIB = 1

 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
--- a/media/omx-plugin/froyo/moz.build
+++ b/media/omx-plugin/froyo/moz.build
@ -10,3 +10,4 @@ SOURCES += [

 LIBRARY_NAME = 'omxpluginfroyo'

+FORCE_SHARED_LIB = True
--- a/media/omx-plugin/gb/Makefile.in
+++ b/media/omx-plugin/gb/Makefile.in
@ -13,7 +13,6 @@
 # limitations under the License.

 MODULE_NAME = omxplugingb
-FORCE_SHARED_LIB = 1

 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
--- a/media/omx-plugin/gb/moz.build
+++ b/media/omx-plugin/gb/moz.build
@ -10,3 +10,4 @@ SOURCES += [

 LIBRARY_NAME = 'omxplugingb'

+FORCE_SHARED_LIB = True
--- a/media/omx-plugin/gb235/Makefile.in
+++ b/media/omx-plugin/gb235/Makefile.in
@ -13,7 +13,6 @@
 # limitations under the License.

 MODULE_NAME = omxplugingb235
-FORCE_SHARED_LIB = 1

 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
--- a/media/omx-plugin/gb235/moz.build
+++ b/media/omx-plugin/gb235/moz.build
@ -10,3 +10,4 @@ SOURCES += [

 LIBRARY_NAME = 'omxplugingb235'

+FORCE_SHARED_LIB = True
--- a/media/omx-plugin/hc/Makefile.in
+++ b/media/omx-plugin/hc/Makefile.in
@ -13,7 +13,6 @@
 # limitations under the License.

 MODULE_NAME = omxpluginhc
-FORCE_SHARED_LIB = 1

 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
--- a/media/omx-plugin/hc/moz.build
+++ b/media/omx-plugin/hc/moz.build
@ -10,3 +10,4 @@ SOURCES += [

 LIBRARY_NAME = 'omxpluginhc'

+FORCE_SHARED_LIB = True
--- a/media/omx-plugin/lib/froyo/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/froyo/libstagefright/Makefile.in
@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 MODULE_NAME = libandroidstagefrightfroyo
-FORCE_SHARED_LIB = 1

 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
--- a/media/omx-plugin/lib/froyo/libstagefright/moz.build
+++ b/media/omx-plugin/lib/froyo/libstagefright/moz.build
@ -12,3 +12,4 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':

 LIBRARY_NAME = 'stagefright'

+FORCE_SHARED_LIB = True
--- a/media/omx-plugin/lib/gb/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/gb/libstagefright/Makefile.in
@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 MODULE_NAME = libandroidstagefrightgb
-FORCE_SHARED_LIB = 1

 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
--- a/media/omx-plugin/lib/gb/libstagefright/moz.build
+++ b/media/omx-plugin/lib/gb/libstagefright/moz.build
@ -12,3 +12,4 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':

 LIBRARY_NAME = 'stagefright'

+FORCE_SHARED_LIB = True
--- a/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in
+++ b/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in
@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 MODULE_NAME = libstagefright_color_conversion
-FORCE_SHARED_LIB = 1

 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
--- a/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build
+++ b/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build
@ -12,3 +12,4 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':

 LIBRARY_NAME = 'stagefright_color_conversion'

+FORCE_SHARED_LIB = True
--- a/media/omx-plugin/lib/gb/libutils/Makefile.in
+++ b/media/omx-plugin/lib/gb/libutils/Makefile.in
@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 MODULE_NAME = libandroidutilsgb
-FORCE_SHARED_LIB = 1

 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
--- a/media/omx-plugin/lib/gb/libutils/moz.build
+++ b/media/omx-plugin/lib/gb/libutils/moz.build
@ -12,3 +12,4 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':

 LIBRARY_NAME = 'utils'

+FORCE_SHARED_LIB = True
--- a/media/omx-plugin/lib/gb235/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/gb235/libstagefright/Makefile.in
@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 MODULE_NAME = libandroidstagefrightgb234
-FORCE_SHARED_LIB = 1

 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
--- a/media/omx-plugin/lib/gb235/libstagefright/moz.build
+++ b/media/omx-plugin/lib/gb235/libstagefright/moz.build
@ -12,3 +12,4 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':

 LIBRARY_NAME = 'stagefright'

+FORCE_SHARED_LIB = True
--- a/media/omx-plugin/lib/hc/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/hc/libstagefright/Makefile.in
@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 MODULE_NAME = libandroidstagefrighthc
-FORCE_SHARED_LIB = 1

 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
--- a/media/omx-plugin/lib/hc/libstagefright/moz.build
+++ b/media/omx-plugin/lib/hc/libstagefright/moz.build
@ -12,3 +12,4 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':

 LIBRARY_NAME = 'stagefright'

+FORCE_SHARED_LIB = True
--- a/media/omx-plugin/lib/ics/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/ics/libstagefright/Makefile.in
@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 MODULE_NAME = libandroidstagefright
-FORCE_SHARED_LIB = 1

 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
--- a/media/omx-plugin/lib/ics/libstagefright/moz.build
+++ b/media/omx-plugin/lib/ics/libstagefright/moz.build
@ -12,3 +12,4 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':

 LIBRARY_NAME = 'stagefright'

+FORCE_SHARED_LIB = True
--- a/media/omx-plugin/lib/ics/libutils/Makefile.in
+++ b/media/omx-plugin/lib/ics/libutils/Makefile.in
@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 MODULE_NAME = libandroidutils
-FORCE_SHARED_LIB = 1

 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
--- a/media/omx-plugin/lib/ics/libutils/moz.build
+++ b/media/omx-plugin/lib/ics/libutils/moz.build
@ -12,3 +12,4 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':

 LIBRARY_NAME = 'utils'

+FORCE_SHARED_LIB = True
--- a/media/omx-plugin/moz.build
+++ b/media/omx-plugin/moz.build
@ -20,3 +20,4 @@ SOURCES += [

 LIBRARY_NAME = 'omxplugin'

+FORCE_SHARED_LIB = True
--- a/memory/mozalloc/Makefile.in
+++ b/memory/mozalloc/Makefile.in
@ -10,10 +10,6 @@ endif

 DIST_INSTALL 	= 1

-ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
-FORCE_SHARED_LIB= 1
-endif
-
 ifeq (,$(filter-out OS2,$(OS_ARCH)))
 # The strndup declaration in string.h is in an ifdef __USE_GNU section
 DEFINES		+= -D_GNU_SOURCE
--- a/memory/mozalloc/moz.build
+++ b/memory/mozalloc/moz.build
@ -42,3 +42,5 @@ LIBRARY_NAME = 'mozalloc'

 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
    FORCE_STATIC_LIB = True
+else:
+    FORCE_SHARED_LIB = True
--- a/memory/replace/dmd/Makefile.in
+++ b/memory/replace/dmd/Makefile.in
@ -3,8 +3,6 @@
 # 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/.

-FORCE_SHARED_LIB= 1
-
 DEFINES 	+= -DMOZ_NO_MOZALLOC

 # Disable mozglue.
--- a/memory/replace/dmd/moz.build
+++ b/memory/replace/dmd/moz.build
@ -20,3 +20,4 @@ SOURCES += [

 LIBRARY_NAME = 'dmd'

+FORCE_SHARED_LIB = True
--- a/memory/replace/dummy/Makefile.in
+++ b/memory/replace/dummy/Makefile.in
@ -1,5 +0,0 @@
-# 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/.
-
-FORCE_SHARED_LIB = 1
--- a/memory/replace/dummy/moz.build
+++ b/memory/replace/dummy/moz.build
@ -11,3 +11,4 @@ SOURCES += [

 LIBRARY_NAME = 'replace_malloc'

+FORCE_SHARED_LIB = True
--- a/memory/replace/jemalloc/Makefile.in
+++ b/memory/replace/jemalloc/Makefile.in
@ -2,8 +2,6 @@
 # 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/.

-FORCE_SHARED_LIB = 1
-
 SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
 DEFINES += -DMOZ_JEMALLOC3 -DMOZ_REPLACE_JEMALLOC
 LOCAL_INCLUDES += -I../../jemalloc/src/include
--- a/memory/replace/jemalloc/moz.build
+++ b/memory/replace/jemalloc/moz.build
@ -20,3 +20,4 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':

 LIBRARY_NAME = 'replace_jemalloc'

+FORCE_SHARED_LIB = True
--- a/mozglue/build/Makefile.in
+++ b/mozglue/build/Makefile.in
@ -5,11 +5,8 @@

 DIST_INSTALL = 1

-# Build mozglue as a shared lib on Windows, OSX and Android.
-# If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in
-ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))
-FORCE_SHARED_LIB = 1
-endif
+# For FORCE_SHARED_LIB
+include $(topsrcdir)/config/config.mk

 ifneq (1_1,$(MOZ_MEMORY)_$(or $(MOZ_NATIVE_JEMALLOC),$(FORCE_SHARED_LIB)))

--- a/mozglue/build/moz.build
+++ b/mozglue/build/moz.build
@ -7,14 +7,12 @@
 # Build mozglue as a shared lib on Windows, OSX and Android.
 # If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in
 if CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android'):
-    # TODO: These should be the all-caps variables when FORCE_SHARED_LIB and
-    # FORCE_STATIC_LIB are ported over
-    force_shared_lib = 1
+    FORCE_SHARED_LIB = True
 else:
-    force_shared_lib = 0
+    FORCE_SHARED_LIB = False
    FORCE_STATIC_LIB = True

-if CONFIG['MOZ_MEMORY'] and (CONFIG['MOZ_NATIVE_JEMALLOC'] or force_shared_lib):
+if CONFIG['MOZ_MEMORY'] and (CONFIG['MOZ_NATIVE_JEMALLOC'] or FORCE_SHARED_LIB):
    pass
    # TODO: SHARED_LIBRARY_LIBS go here
 else:
--- a/security/build/Makefile.in
+++ b/security/build/Makefile.in
@ -6,10 +6,6 @@
 CC_WRAPPER =
 CXX_WRAPPER =

-ifdef MOZ_FOLD_LIBS
-FORCE_SHARED_LIB = 1
-endif
-
 default::

 include $(topsrcdir)/config/makefiles/functions.mk
--- a/security/build/moz.build
+++ b/security/build/moz.build
@ -7,3 +7,5 @@
 if CONFIG['MOZ_FOLD_LIBS']:
    # TODO: The library name can be changed when bug 845217 is fixed.
    LIBRARY_NAME = 'nss3'
+
+    FORCE_SHARED_LIB = True
--- a/security/sandbox/win/src/sandboxbroker/Makefile.in
+++ b/security/sandbox/win/src/sandboxbroker/Makefile.in
@ -2,7 +2,6 @@
 # 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/.
 #
-FORCE_SHARED_LIB = 1
 MOZ_GLUE_LDFLAGS =
 STL_FLAGS =

--- a/security/sandbox/win/src/sandboxbroker/moz.build
+++ b/security/sandbox/win/src/sandboxbroker/moz.build
@ -14,3 +14,5 @@ SOURCES += [
 EXPORTS += [
    'sandboxBroker.h',
 ]
+
+FORCE_SHARED_LIB = True
--- a/toolkit/components/ctypes/tests/Makefile.in
+++ b/toolkit/components/ctypes/tests/Makefile.in
@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 SHORT_LIBNAME = jscttest
-FORCE_SHARED_LIB = 1

 LOCAL_INCLUDES = \
    -I$(topsrcdir)/js/src/ctypes \
--- a/toolkit/components/ctypes/tests/moz.build
+++ b/toolkit/components/ctypes/tests/moz.build
@ -15,3 +15,4 @@ SOURCES += [

 LIBRARY_NAME = 'jsctypes-test'

+FORCE_SHARED_LIB = True
--- a/toolkit/crashreporter/injector/Makefile.in
+++ b/toolkit/crashreporter/injector/Makefile.in
@ -2,7 +2,6 @@
 # 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/.

-FORCE_SHARED_LIB = 1
 USE_STATIC_LIBS = 1
 STL_FLAGS =
 MOZ_GLUE_LDFLAGS =
--- a/toolkit/crashreporter/injector/moz.build
+++ b/toolkit/crashreporter/injector/moz.build
@ -12,3 +12,4 @@ LIBRARY_NAME = 'breakpadinjector'

 include('/ipc/chromium/chromium-config.mozbuild')

+FORCE_SHARED_LIB = True
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@ -3,8 +3,6 @@
 # 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/.

-FORCE_SHARED_LIB = 1
-
 VPATH += \
  $(srcdir)/../google-breakpad/src/processor/ \
  $(srcdir)/../google-breakpad/src/common/ \
--- a/toolkit/crashreporter/test/moz.build
+++ b/toolkit/crashreporter/test/moz.build
@ -21,3 +21,5 @@ LIBRARY_NAME = 'testcrasher'
 EXTRA_JS_MODULES += [
    'CrashTestUtils.jsm',
 ]
+
+FORCE_SHARED_LIB = True
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@ -2,7 +2,6 @@
 # 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/.

-FORCE_SHARED_LIB = 1
 MOZILLA_INTERNAL_API = 1

 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@ -19,3 +19,5 @@ if CONFIG['OS_ARCH'] == 'WINNT':
    ]

 MSVC_ENABLE_PGO = True
+
+FORCE_SHARED_LIB = True
--- a/toolkit/library/winvccorlib/Makefile.in
+++ b/toolkit/library/winvccorlib/Makefile.in
@ -1,11 +0,0 @@
-# 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/.
-
-# When we're linking GTest we recurse into this directory but don't need
-# to generate this library
-ifndef LINK_GTEST
-
-FORCE_SHARED_LIB=1
-
-endif
--- a/toolkit/library/winvccorlib/moz.build
+++ b/toolkit/library/winvccorlib/moz.build
@ -4,9 +4,13 @@
 # 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/.

+# When we're linking GTest we recurse into this directory but don't need
+# to generate this library
 if not CONFIG['LINK_GTEST']:
    LIBRARY_NAME = 'dummyvccorlib'

+    FORCE_SHARED_LIB = True
+
 SOURCES += [
    'dummyvccorlib.cpp',
 ]
--- a/toolkit/system/dbus/Makefile.in
+++ b/toolkit/system/dbus/Makefile.in
@ -2,8 +2,6 @@
 # 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/.

-FORCE_SHARED_LIB = 1
-
 EXTRA_DSO_LDOPTS = \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
--- a/toolkit/system/dbus/moz.build
+++ b/toolkit/system/dbus/moz.build
@ -14,3 +14,4 @@ LIBRARY_NAME = 'dbusservice'

 IS_COMPONENT = True

+FORCE_SHARED_LIB = True
--- a/toolkit/system/gnome/Makefile.in
+++ b/toolkit/system/gnome/Makefile.in
@ -2,7 +2,6 @@
 # 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/.

-FORCE_SHARED_LIB = 1
 EXTRA_DSO_LDOPTS += \
 		$(XPCOM_GLUE_LDOPTS) \
 		$(XPCOM_FROZEN_LDOPTS) \
--- a/toolkit/system/gnome/moz.build
+++ b/toolkit/system/gnome/moz.build
@ -29,3 +29,4 @@ LIBRARY_NAME = 'mozgnome'
 FAIL_ON_WARNINGS = True
 IS_COMPONENT = True

+FORCE_SHARED_LIB = True
--- a/tools/jprof/stub/Makefile.in
+++ b/tools/jprof/stub/Makefile.in
@ -4,8 +4,6 @@
 # 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/.

-FORCE_SHARED_LIB = 1
-
 # override optimization
 MOZ_OPTIMIZE_FLAGS = -fno-omit-frame-pointer

--- a/tools/jprof/stub/moz.build
+++ b/tools/jprof/stub/moz.build
@ -16,3 +16,4 @@ LIBRARY_NAME = 'jprof'

 EXPORT_LIBRARY = True

+FORCE_SHARED_LIB = True
--- a/xpcom/tests/bug656331_component/Makefile.in
+++ b/xpcom/tests/bug656331_component/Makefile.in
@ -5,8 +5,6 @@

 # Blatantly copied from xpcom/tests/component.

-FORCE_SHARED_LIB = 1
-
 unittestlocation = xpcom/tests/unit

 MANIFEST = bug656331.manifest
--- a/xpcom/tests/bug656331_component/moz.build
+++ b/xpcom/tests/bug656331_component/moz.build
@ -14,3 +14,4 @@ LIBRARY_NAME = 'test656331'

 IS_COMPONENT = True

+FORCE_SHARED_LIB = True
--- a/xpcom/tests/component/Makefile.in
+++ b/xpcom/tests/component/Makefile.in
@ -3,8 +3,6 @@
 # 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/.

-FORCE_SHARED_LIB = 1
-
 unittestlocation = xpcom/tests/unit

 MANIFEST = testcomponent.manifest
--- a/xpcom/tests/component/moz.build
+++ b/xpcom/tests/component/moz.build
@ -14,3 +14,4 @@ LIBRARY_NAME = 'testcomponent'

 IS_COMPONENT = True

+FORCE_SHARED_LIB = True
--- a/xpcom/tests/component_no_aslr/Makefile.in
+++ b/xpcom/tests/component_no_aslr/Makefile.in
@ -3,8 +3,6 @@
 # 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/.

-FORCE_SHARED_LIB = 1
-
 unittestlocation = xpcom/tests/unit

 MANIFEST = testcompnoaslr.manifest
--- a/xpcom/tests/component_no_aslr/moz.build
+++ b/xpcom/tests/component_no_aslr/moz.build
@ -14,3 +14,4 @@ LIBRARY_NAME = 'testcompnoaslr'

 IS_COMPONENT = True

+FORCE_SHARED_LIB = True