Bug 939632 - Remove LIBRARY_NAME for leaf libraries. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 19 Nov 2013 11:50:54 +0900
changeset 156210 e4b59fdbc9c2dfc8d28cdcdc2888bf4a21376826
parent 156209 7222bce61677d45e005d9af6222ce5c92dd4cb99
child 156211 95813fcf6a629fff1453e3f83eaa6285403521f1
child 156327 ba9ecdea3a90a50fcec3153b7d7d9ad66a7fc51e
child 156334 b5b42984ae11960a600144e6fa8ae17f2a9b4af9
child 156365 892bb017f8ba5d8cc9b0f6bf08dbc7d54f53761d
push id36313
push userphilringnalda@gmail.com
push dateTue, 19 Nov 2013 04:12:56 +0000
treeherdermozilla-inbound@e4b59fdbc9c2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs939632
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 939632 - Remove LIBRARY_NAME for leaf libraries. r=gps Landing on a CLOSED TREE.
accessible/src/atk/moz.build
accessible/src/base/moz.build
accessible/src/generic/moz.build
accessible/src/html/moz.build
accessible/src/mac/moz.build
accessible/src/other/moz.build
accessible/src/windows/ia2/moz.build
accessible/src/windows/msaa/moz.build
accessible/src/windows/sdn/moz.build
accessible/src/windows/uia/moz.build
accessible/src/xpcom/moz.build
accessible/src/xul/moz.build
browser/components/about/moz.build
browser/components/dirprovider/moz.build
browser/components/feeds/src/moz.build
browser/components/migration/src/moz.build
browser/components/shell/src/moz.build
caps/src/moz.build
chrome/src/moz.build
content/base/src/moz.build
content/canvas/src/moz.build
content/events/src/moz.build
content/html/content/src/moz.build
content/html/document/src/moz.build
content/mathml/content/src/moz.build
content/media/apple/moz.build
content/media/directshow/moz.build
content/media/encoder/moz.build
content/media/gstreamer/moz.build
content/media/mediasource/moz.build
content/media/moz.build
content/media/ogg/moz.build
content/media/omx/mediaresourcemanager/moz.build
content/media/omx/moz.build
content/media/plugins/moz.build
content/media/raw/moz.build
content/media/wave/moz.build
content/media/webaudio/blink/moz.build
content/media/webaudio/moz.build
content/media/webm/moz.build
content/media/webrtc/moz.build
content/media/webspeech/recognition/moz.build
content/media/webspeech/synth/moz.build
content/media/webspeech/synth/pico/moz.build
content/media/wmf/moz.build
content/smil/moz.build
content/svg/content/src/moz.build
content/svg/document/src/moz.build
content/xbl/src/moz.build
content/xml/content/src/moz.build
content/xml/document/src/moz.build
content/xslt/src/base/moz.build
content/xslt/src/xml/moz.build
content/xslt/src/xpath/moz.build
content/xslt/src/xslt/moz.build
content/xul/content/src/moz.build
content/xul/document/src/moz.build
content/xul/templates/src/moz.build
docshell/base/moz.build
docshell/build/moz.build
docshell/shistory/src/moz.build
dom/activities/src/moz.build
dom/alarm/moz.build
dom/apps/src/moz.build
dom/audiochannel/moz.build
dom/base/moz.build
dom/battery/moz.build
dom/bindings/moz.build
dom/bluetooth/moz.build
dom/browser-element/moz.build
dom/camera/moz.build
dom/cellbroadcast/src/moz.build
dom/devicestorage/moz.build
dom/encoding/moz.build
dom/file/moz.build
dom/fmradio/moz.build
dom/gamepad/moz.build
dom/icc/src/moz.build
dom/indexedDB/ipc/moz.build
dom/indexedDB/moz.build
dom/ipc/moz.build
dom/media/bridge/moz.build
dom/media/moz.build
dom/mobilemessage/src/moz.build
dom/network/src/moz.build
dom/nfc/moz.build
dom/plugins/base/android/moz.build
dom/plugins/base/moz.build
dom/plugins/ipc/moz.build
dom/power/moz.build
dom/promise/moz.build
dom/quota/moz.build
dom/src/events/moz.build
dom/src/geolocation/moz.build
dom/src/json/moz.build
dom/src/jsurl/moz.build
dom/src/notification/moz.build
dom/src/offline/moz.build
dom/src/storage/moz.build
dom/system/android/moz.build
dom/system/gonk/moz.build
dom/system/mac/moz.build
dom/system/moz.build
dom/system/unix/moz.build
dom/system/windows/moz.build
dom/telephony/moz.build
dom/time/moz.build
dom/voicemail/moz.build
dom/wifi/moz.build
dom/workers/moz.build
editor/composer/src/moz.build
editor/libeditor/base/moz.build
editor/libeditor/html/moz.build
editor/libeditor/text/moz.build
editor/txmgr/src/moz.build
editor/txtsvc/src/moz.build
embedding/browser/webBrowser/moz.build
embedding/components/appstartup/src/moz.build
embedding/components/commandhandler/src/moz.build
embedding/components/find/src/moz.build
embedding/components/printingui/src/mac/moz.build
embedding/components/printingui/src/os2/moz.build
embedding/components/printingui/src/unixshared/moz.build
embedding/components/printingui/src/win/moz.build
embedding/components/webbrowserpersist/src/moz.build
embedding/components/windowwatcher/src/moz.build
extensions/auth/moz.build
extensions/cookie/moz.build
extensions/gio/moz.build
extensions/permissions/moz.build
extensions/pref/autoconfig/src/moz.build
extensions/spellcheck/hunspell/src/moz.build
extensions/universalchardet/src/base/moz.build
gfx/2d/moz.build
gfx/angle/moz.build
gfx/cairo/cairo/src/moz.build
gfx/cairo/libpixman/src/moz.build
gfx/gl/moz.build
gfx/graphite2/src/moz.build
gfx/harfbuzz/src/moz.build
gfx/ipc/moz.build
gfx/layers/moz.build
gfx/ots/src/moz.build
gfx/qcms/moz.build
gfx/skia/moz.build
gfx/src/moz.build
gfx/ycbcr/moz.build
hal/moz.build
image/decoders/icon/android/moz.build
image/decoders/icon/gtk/moz.build
image/decoders/icon/mac/moz.build
image/decoders/icon/os2/moz.build
image/decoders/icon/qt/moz.build
image/decoders/icon/win/moz.build
image/decoders/moz.build
image/encoders/bmp/moz.build
image/encoders/ico/moz.build
image/encoders/jpeg/moz.build
image/encoders/png/moz.build
image/src/moz.build
intl/chardet/src/moz.build
intl/hyphenation/src/moz.build
intl/locale/src/mac/moz.build
intl/locale/src/moz.build
intl/locale/src/os2/moz.build
intl/locale/src/unix/moz.build
intl/locale/src/windows/moz.build
intl/lwbrk/src/moz.build
intl/strres/src/moz.build
intl/uconv/src/moz.build
intl/unicharutil/src/moz.build
intl/unicharutil/util/internal/moz.build
ipc/chromium/moz.build
ipc/dbus/moz.build
ipc/glue/moz.build
ipc/ipdl/moz.build
ipc/ipdl/test/cxx/moz.build
ipc/keystore/moz.build
ipc/netd/moz.build
ipc/nfc/moz.build
ipc/ril/moz.build
ipc/testshell/moz.build
ipc/unixsocket/moz.build
js/ductwork/debugger/moz.build
js/ipc/moz.build
js/jsd/moz.build
js/xpconnect/loader/moz.build
js/xpconnect/wrappers/moz.build
layout/base/moz.build
layout/forms/moz.build
layout/generic/moz.build
layout/inspector/src/moz.build
layout/ipc/moz.build
layout/mathml/moz.build
layout/printing/moz.build
layout/style/moz.build
layout/svg/moz.build
layout/tables/moz.build
layout/tools/layout-debug/src/moz.build
layout/xul/base/src/moz.build
layout/xul/grid/moz.build
layout/xul/tree/moz.build
media/kiss_fft/moz.build
media/libcubeb/src/moz.build
media/libjpeg/moz.build
media/libnestegg/src/moz.build
media/libogg/moz.build
media/libopus/moz.build
media/libsoundtouch/src/moz.build
media/libspeex_resampler/src/moz.build
media/libtheora/lib/moz.build
media/libtremor/lib/moz.build
media/libvorbis/moz.build
media/libvpx/moz.build
modules/libjar/zipwriter/src/moz.build
modules/libpref/src/moz.build
mozglue/android/moz.build
netwerk/base/src/moz.build
netwerk/cache/moz.build
netwerk/cache2/moz.build
netwerk/cookie/moz.build
netwerk/dns/moz.build
netwerk/ipc/moz.build
netwerk/mime/moz.build
netwerk/protocol/about/moz.build
netwerk/protocol/app/moz.build
netwerk/protocol/data/moz.build
netwerk/protocol/device/moz.build
netwerk/protocol/file/moz.build
netwerk/protocol/ftp/moz.build
netwerk/protocol/http/moz.build
netwerk/protocol/res/moz.build
netwerk/protocol/rtsp/moz.build
netwerk/protocol/viewsource/moz.build
netwerk/protocol/websocket/moz.build
netwerk/protocol/wyciwyg/moz.build
netwerk/sctp/datachannel/moz.build
netwerk/socket/moz.build
netwerk/streamconv/converters/moz.build
netwerk/streamconv/src/moz.build
netwerk/system/android/moz.build
netwerk/system/mac/moz.build
netwerk/system/qt/moz.build
netwerk/system/win32/moz.build
netwerk/wifi/moz.build
other-licenses/android/moz.build
other-licenses/skia-npapi/moz.build
other-licenses/snappy/moz.build
parser/expat/lib/moz.build
parser/html/moz.build
parser/xml/src/moz.build
rdf/base/src/moz.build
rdf/datasource/src/moz.build
rdf/util/src/internal/moz.build
security/manager/boot/src/moz.build
security/manager/pki/src/moz.build
security/manager/ssl/src/moz.build
security/sandbox/linux/moz.build
services/crypto/component/moz.build
startupcache/moz.build
storage/src/moz.build
toolkit/components/alerts/moz.build
toolkit/components/autocomplete/moz.build
toolkit/components/commandlines/moz.build
toolkit/components/ctypes/moz.build
toolkit/components/diskspacewatcher/moz.build
toolkit/components/downloads/moz.build
toolkit/components/filepicker/moz.build
toolkit/components/finalizationwitness/moz.build
toolkit/components/find/moz.build
toolkit/components/intl/moz.build
toolkit/components/jsdownloads/src/moz.build
toolkit/components/mediasniffer/moz.build
toolkit/components/parentalcontrols/moz.build
toolkit/components/perf/moz.build
toolkit/components/places/moz.build
toolkit/components/protobuf/moz.build
toolkit/components/reflect/moz.build
toolkit/components/remote/moz.build
toolkit/components/satchel/moz.build
toolkit/components/startup/moz.build
toolkit/components/statusfilter/moz.build
toolkit/components/telemetry/moz.build
toolkit/components/typeaheadfind/moz.build
toolkit/components/url-classifier/moz.build
toolkit/crashreporter/breakpad-windows-standalone/moz.build
toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build
toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build
toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build
toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build
toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build
toolkit/crashreporter/google-breakpad/src/client/moz.build
toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build
toolkit/crashreporter/google-breakpad/src/processor/moz.build
toolkit/crashreporter/moz.build
toolkit/devtools/server/moz.build
toolkit/identity/moz.build
toolkit/profile/moz.build
toolkit/system/androidproxy/moz.build
toolkit/system/osxproxy/moz.build
toolkit/system/unixproxy/moz.build
toolkit/system/windowsproxy/moz.build
tools/profiler/moz.build
tools/trace-malloc/lib/moz.build
uriloader/base/moz.build
uriloader/exthandler/moz.build
uriloader/prefetch/moz.build
view/src/moz.build
widget/gonk/nativewindow/moz.build
widget/gtkxtbin/moz.build
widget/qt/faststartupqt/moz.build
widget/shared/moz.build
widget/shared/x11/moz.build
widget/windows/winrt/moz.build
widget/xremoteclient/moz.build
xpcom/base/moz.build
xpcom/components/moz.build
xpcom/ds/moz.build
xpcom/io/moz.build
xpcom/reflect/xptcall/src/md/os2/moz.build
xpcom/reflect/xptcall/src/md/unix/moz.build
xpcom/reflect/xptcall/src/md/win32/moz.build
xpcom/reflect/xptcall/src/moz.build
xpcom/reflect/xptinfo/src/moz.build
xpcom/string/src/moz.build
xpcom/threads/moz.build
xpfe/appshell/src/moz.build
xpfe/components/directory/moz.build
xpfe/components/windowds/moz.build
--- a/accessible/src/atk/moz.build
+++ b/accessible/src/atk/moz.build
@@ -26,18 +26,16 @@ SOURCES += [
     'nsMaiInterfaceTable.cpp',
     'nsMaiInterfaceText.cpp',
     'nsMaiInterfaceValue.cpp',
     'Platform.cpp',
     'RootAccessibleWrap.cpp',
     'UtilInterface.cpp',
 ]
 
-LIBRARY_NAME = 'accessibility_toolkit_s'
-
 LOCAL_INCLUDES += [
     '../base',
     '../generic',
     '../html',
     '../xpcom',
     '../xul',
     '/other-licenses/atk-1.0',
 ]
--- a/accessible/src/base/moz.build
+++ b/accessible/src/base/moz.build
@@ -53,18 +53,16 @@ UNIFIED_SOURCES += [
     'TreeWalker.cpp',
 ]
 
 if a11y_log:
     UNIFIED_SOURCES += [
         'Logging.cpp',
     ]
 
-LIBRARY_NAME = 'accessibility_base_s'
-
 LOCAL_INCLUDES += [
     '../../../content/xbl/src',
     '../../../ipc/chromium/src',
     '../../../layout/generic',
     '../../../layout/style',
     '../../../layout/svg',
     '../../../layout/xul/base/src',
     '../../../layout/xul/tree/',
--- a/accessible/src/generic/moz.build
+++ b/accessible/src/generic/moz.build
@@ -20,18 +20,16 @@ UNIFIED_SOURCES += [
     'HyperTextAccessible.cpp',
     'ImageAccessible.cpp',
     'OuterDocAccessible.cpp',
     'RootAccessible.cpp',
     'TableCellAccessible.cpp',
     'TextLeafAccessible.cpp',
 ]
 
-LIBRARY_NAME = 'accessibility_generic_s'
-
 LOCAL_INCLUDES += [
     '../../../layout/generic',
     '../../../layout/xul/base/src',
     '../base',
     '../html',
     '../xpcom',
     '../xul',
 ]
--- a/accessible/src/html/moz.build
+++ b/accessible/src/html/moz.build
@@ -10,18 +10,16 @@ UNIFIED_SOURCES += [
     'HTMLFormControlAccessible.cpp',
     'HTMLImageMapAccessible.cpp',
     'HTMLLinkAccessible.cpp',
     'HTMLListAccessible.cpp',
     'HTMLSelectAccessible.cpp',
     'HTMLTableAccessible.cpp',
 ]
 
-LIBRARY_NAME = 'accessibility_html_s'
-
 LOCAL_INCLUDES += [
     '../../../layout/generic',
     '../../../layout/tables',
     '../../../layout/xul/base/src',
     '../base',
     '../generic',
     '../xpcom',
 ]
--- a/accessible/src/mac/moz.build
+++ b/accessible/src/mac/moz.build
@@ -8,18 +8,16 @@ EXPORTS += [
     'mozAccessibleProtocol.h',
 ]
 
 EXPORTS.mozilla.a11y += [
     'AccessibleWrap.h',
     'HyperTextAccessibleWrap.h',
 ]
 
-LIBRARY_NAME = 'accessibility_toolkit_s'
-
 UNIFIED_SOURCES += [
     'AccessibleWrap.mm',
     'DocAccessibleWrap.mm',
     'MacUtils.mm',
     'mozAccessible.mm',
     'mozActionElements.mm',
     'mozDocAccessible.mm',
     'mozHTMLAccessible.mm',
--- a/accessible/src/other/moz.build
+++ b/accessible/src/other/moz.build
@@ -9,18 +9,16 @@ EXPORTS.mozilla.a11y += [
     'HyperTextAccessibleWrap.h',
 ]
 
 SOURCES += [
     'AccessibleWrap.cpp',
     'Platform.cpp',
 ]
 
-LIBRARY_NAME = 'accessibility_toolkit_s'
-
 LOCAL_INCLUDES += [
     '../base',
     '../generic',
     '../html',
     '../xul',
 ]
 
 FINAL_LIBRARY = 'xul'
--- a/accessible/src/windows/ia2/moz.build
+++ b/accessible/src/windows/ia2/moz.build
@@ -34,11 +34,9 @@ LOCAL_INCLUDES += [
     '../../base',
     '../../generic',
     '../../html',
     '../../xpcom',
     '../../xul',
     '../msaa',
 ]
 
-LIBRARY_NAME = 'accessibility_toolkit_ia2_s'
-
 FINAL_LIBRARY = 'xul'
--- a/accessible/src/windows/msaa/moz.build
+++ b/accessible/src/windows/msaa/moz.build
@@ -48,13 +48,11 @@ LOCAL_INCLUDES += [
     '../../html',
     '../../xpcom',
     '../../xul',
     '../ia2',
     '../sdn',
     '../uia',
 ]
 
-LIBRARY_NAME = 'accessibility_toolkit_msaa_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/accessible/src/windows/sdn/moz.build
+++ b/accessible/src/windows/sdn/moz.build
@@ -18,11 +18,9 @@ LOCAL_INCLUDES += [
     '../../xul',
     '../msaa',
 ]
 
 # The midl generated code include Windows headers which defines min and max
 # macros which conflicts with std::min/max.  Suppress the macros:
 DEFINES['NOMINMAX'] = True
 
-LIBRARY_NAME = 'accessibility_toolkit_sdn_s'
-
 FINAL_LIBRARY = 'xul'
--- a/accessible/src/windows/uia/moz.build
+++ b/accessible/src/windows/uia/moz.build
@@ -12,11 +12,9 @@ LOCAL_INCLUDES += [
     '../../base',
     '../../generic',
     '../../html',
     '../../xpcom',
     '../../xul',
     '../msaa',
 ]
 
-LIBRARY_NAME = 'accessibility_toolkit_uia_s'
-
 FINAL_LIBRARY = 'xul'
--- a/accessible/src/xpcom/moz.build
+++ b/accessible/src/xpcom/moz.build
@@ -16,18 +16,16 @@ UNIFIED_SOURCES += [
     'xpcAccessibleTable.cpp',
     'xpcAccessibleTableCell.cpp',
 ]
 
 GENERATED_SOURCES += [
     'xpcAccEvents.cpp',
 ]
 
-LIBRARY_NAME = 'accessibility_xpcom_s'
-
 LOCAL_INCLUDES += [
     '../base',
     '../generic',
 ]
 
 if CONFIG['MOZ_ENABLE_GTK']:
     LOCAL_INCLUDES += [
         '../atk',
--- a/accessible/src/xul/moz.build
+++ b/accessible/src/xul/moz.build
@@ -14,18 +14,16 @@ UNIFIED_SOURCES += [
     'XULMenuAccessible.cpp',
     'XULSelectControlAccessible.cpp',
     'XULSliderAccessible.cpp',
     'XULTabAccessible.cpp',
     'XULTreeAccessible.cpp',
     'XULTreeGridAccessible.cpp',
 ]
 
-LIBRARY_NAME = 'accessibility_xul_s'
-
 LOCAL_INCLUDES += [
     '../../../layout/generic',
     '../../../layout/xul/base/src',
     '../../../layout/xul/tree//',
     '../base',
     '../generic',
     '../html',
     '../xpcom',
--- a/browser/components/about/moz.build
+++ b/browser/components/about/moz.build
@@ -7,11 +7,9 @@
 EXPORTS.mozilla.browser += [
     'AboutRedirector.h',
 ]
 
 SOURCES += [
     'AboutRedirector.cpp',
 ]
 
-LIBRARY_NAME = 'browserabout_s'
-
 FINAL_LIBRARY = 'browsercomps'
--- a/browser/components/dirprovider/moz.build
+++ b/browser/components/dirprovider/moz.build
@@ -7,15 +7,13 @@
 EXPORTS.mozilla.browser += [
     'DirectoryProvider.h',
 ]
 
 SOURCES += [
     'DirectoryProvider.cpp',
 ]
 
-LIBRARY_NAME = 'browserdir_s'
-
 XPCSHELL_TESTS_MANIFESTS += [
     'tests/unit/xpcshell.ini',
 ]
 
 FINAL_LIBRARY = 'browsercomps'
--- a/browser/components/feeds/src/moz.build
+++ b/browser/components/feeds/src/moz.build
@@ -13,11 +13,9 @@ EXTRA_COMPONENTS += [
     'FeedConverter.js',
     'WebContentConverter.js',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'FeedWriter.js',
 ]
 
-LIBRARY_NAME = 'browser_feeds_s'
-
 FINAL_LIBRARY = 'browsercomps'
--- a/browser/components/migration/src/moz.build
+++ b/browser/components/migration/src/moz.build
@@ -29,15 +29,13 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         'SafariProfileMigrator.js',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXTRA_PP_COMPONENTS += [
         'SafariProfileMigrator.js',
     ]
 
-LIBRARY_NAME = 'migration_s'
-
 EXTRA_PP_JS_MODULES += [
     'MigrationUtils.jsm',
 ]
 
 FINAL_LIBRARY = 'browsercomps'
--- a/browser/components/shell/src/moz.build
+++ b/browser/components/shell/src/moz.build
@@ -13,16 +13,14 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
         'nsMacShellService.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_GTK']:
     SOURCES += [
         'nsGNOMEShellService.cpp',
     ]
 
 if SOURCES:
-    LIBRARY_NAME = 'shellservice_s'
+    FINAL_LIBRARY = 'browsercomps'
 
 EXTRA_COMPONENTS += [
     'nsSetDefaultBrowser.js',
     'nsSetDefaultBrowser.manifest',
 ]
-
-FINAL_LIBRARY = 'browsercomps'
--- a/caps/src/moz.build
+++ b/caps/src/moz.build
@@ -10,18 +10,16 @@ SOURCES += [
     'nsNullPrincipal.cpp',
     'nsNullPrincipalURI.cpp',
     'nsPrincipal.cpp',
     'nsScriptSecurityManager.cpp',
     'nsSecurityManagerFactory.cpp',
     'nsSystemPrincipal.cpp',
 ]
 
-LIBRARY_NAME = 'caps_s'
-
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../include',
     '/dom/base',
     '/js/xpconnect/src',
 ]
 
--- a/chrome/src/moz.build
+++ b/chrome/src/moz.build
@@ -12,13 +12,11 @@ SOURCES += [
     'nsChromeProtocolHandler.cpp',
     'nsChromeRegistry.cpp',
     'nsChromeRegistryChrome.cpp',
     'nsChromeRegistryContent.cpp',
 ]
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'chrome_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xpcom_core'
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -174,18 +174,16 @@ EXTRA_PP_COMPONENTS += [
 EXTRA_JS_MODULES += [
     'CSPUtils.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'gkconbase_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/caps/include',
     '/content/events/src',
     '/content/html/content/src',
     '/content/html/document/src',
--- a/content/canvas/src/moz.build
+++ b/content/canvas/src/moz.build
@@ -78,18 +78,16 @@ else:
     UNIFIED_SOURCES += [
         'WebGLContextNotSupported.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'gkconcvs_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
     '/content/xul/content/src',
     '/dom/base',
--- a/content/events/src/moz.build
+++ b/content/events/src/moz.build
@@ -64,18 +64,16 @@ SOURCES += [
 
 if CONFIG['MOZ_WEBSPEECH']:
     SOURCES += ['SpeechRecognitionError.cpp']
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'gkconevents_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
     '/content/xml/content/src',
     '/content/xul/content/src',
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -153,18 +153,16 @@ SOURCES += [
     'UndoManager.cpp',
     'ValidityState.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'gkconhtmlcon_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/canvas/src',
     '/content/events/src',
     '/content/html/document/src',
--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@@ -18,18 +18,16 @@ SOURCES += [
     'ImageDocument.cpp',
     'MediaDocument.cpp',
     'nsHTMLContentSink.cpp',
     'nsHTMLDocument.cpp',
     'PluginDocument.cpp',
     'VideoDocument.cpp',
 ]
 
-LIBRARY_NAME = 'gkconhtmldoc_s'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../../content/src',
     '/caps/include',
     '/content/base/src',
--- a/content/mathml/content/src/moz.build
+++ b/content/mathml/content/src/moz.build
@@ -6,17 +6,15 @@
 
 SOURCES += [
     'nsMathMLElement.cpp',
     'nsMathMLElementFactory.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'gkcontentmathml_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
 ]
 
--- a/content/media/apple/moz.build
+++ b/content/media/apple/moz.build
@@ -9,13 +9,11 @@ EXPORTS += [
     'AppleMP3Reader.h',
 ]
 
 UNIFIED_SOURCES += [
     'AppleDecoder.cpp',
     'AppleMP3Reader.cpp',
 ]
 
-LIBRARY_NAME = 'gkconapplemedia_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/media/directshow/moz.build
+++ b/content/media/directshow/moz.build
@@ -29,15 +29,13 @@ if not CONFIG['MOZ_WEBRTC']:
         'media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseFilter.cpp',
         'media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseInputPin.cpp',
         'media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.cpp',
         'media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp',
     ]]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'gkcondirectshow_s'
-
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/media/webrtc/trunk/webrtc/modules/video_capture/windows',
 ]
 
--- a/content/media/encoder/moz.build
+++ b/content/media/encoder/moz.build
@@ -16,13 +16,11 @@ UNIFIED_SOURCES += [
     'MediaEncoder.cpp',
     'TrackEncoder.cpp',
 ]
 
 if CONFIG['MOZ_OPUS']:
     EXPORTS += ['OpusTrackEncoder.h']
     UNIFIED_SOURCES += ['OpusTrackEncoder.cpp']
 
-LIBRARY_NAME = 'gkconencoder_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/media/gstreamer/moz.build
+++ b/content/media/gstreamer/moz.build
@@ -14,18 +14,16 @@ EXPORTS += [
 SOURCES += [
     'GStreamerDecoder.cpp',
     'GStreamerFormatHelper.cpp',
     'GStreamerLoader.cpp',
     'GStreamerMozVideoBuffer.cpp',
     'GStreamerReader.cpp',
 ]
 
-LIBRARY_NAME = 'gkcongstreamer_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
 ]
 
--- a/content/media/mediasource/moz.build
+++ b/content/media/mediasource/moz.build
@@ -23,11 +23,9 @@ UNIFIED_SOURCES += [
     'MediaSourceDecoder.cpp',
     'SourceBuffer.cpp',
     'SourceBufferList.cpp',
     'SourceBufferResource.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'gkconmediasource_s'
-
 FINAL_LIBRARY = 'gklayout'
--- a/content/media/moz.build
+++ b/content/media/moz.build
@@ -145,18 +145,16 @@ FAIL_ON_WARNINGS = True
 
 if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']:
     SOURCES += [
         'AudioNodeEngineNEON.cpp',
     ]
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'gkconmedia_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/layout/generic',
     '/layout/xul/base/src',
 ]
--- a/content/media/ogg/moz.build
+++ b/content/media/ogg/moz.build
@@ -13,13 +13,11 @@ EXPORTS += [
 
 UNIFIED_SOURCES += [
     'OggCodecState.cpp',
     'OggDecoder.cpp',
     'OggReader.cpp',
     'OggWriter.cpp',
 ]
 
-LIBRARY_NAME = 'gkconogg_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/media/omx/mediaresourcemanager/moz.build
+++ b/content/media/omx/mediaresourcemanager/moz.build
@@ -7,13 +7,11 @@
 SOURCES += [
     'IMediaResourceManagerClient.cpp',
     'IMediaResourceManagerDeathNotifier.cpp',
     'IMediaResourceManagerService.cpp',
     'MediaResourceManagerClient.cpp',
     'MediaResourceManagerService.cpp',
 ]
 
-LIBRARY_NAME = 'mediaresourcemanager'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/media/omx/moz.build
+++ b/content/media/omx/moz.build
@@ -21,18 +21,16 @@ if 'rtsp' in CONFIG['NECKO_PROTOCOLS']:
         'RtspOmxDecoder.h',
         'RtspOmxReader.h',
     ]
     SOURCES += [
         'RtspOmxDecoder.cpp',
         'RtspOmxReader.cpp',
     ]
 
-LIBRARY_NAME = 'gkconomx_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
     '/ipc/chromium/src',
     'mediaresourcemanager',
--- a/content/media/plugins/moz.build
+++ b/content/media/plugins/moz.build
@@ -14,16 +14,14 @@ EXPORTS += [
 
 SOURCES += [
     'MediaPluginDecoder.cpp',
     'MediaPluginHost.cpp',
     'MediaPluginReader.cpp',
     'MediaResourceServer.cpp',
 ]
 
-LIBRARY_NAME = 'gkconmediaplugins_s'
-
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
     ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/media/raw/moz.build
+++ b/content/media/raw/moz.build
@@ -10,18 +10,16 @@ EXPORTS += [
     'RawStructs.h',
 ]
 
 UNIFIED_SOURCES += [
     'RawDecoder.cpp',
     'RawReader.cpp',
 ]
 
-LIBRARY_NAME = 'gkconraw_s'
-
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/media/wave/moz.build
+++ b/content/media/wave/moz.build
@@ -9,13 +9,11 @@ EXPORTS += [
     'WaveReader.h',
 ]
 
 UNIFIED_SOURCES += [
     'WaveDecoder.cpp',
     'WaveReader.cpp',
 ]
 
-LIBRARY_NAME = 'gkconwave_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/media/webaudio/blink/moz.build
+++ b/content/media/webaudio/blink/moz.build
@@ -19,17 +19,15 @@ SOURCES += [
     'Reverb.cpp',
     'ReverbAccumulationBuffer.cpp',
     'ReverbConvolver.cpp',
     'ReverbConvolverStage.cpp',
     'ReverbInputBuffer.cpp',
     'ZeroPole.cpp',
 ]
 
-LIBRARY_NAME = 'gkconwebaudio_blink_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/media/webaudio',
 ]
 
--- a/content/media/webaudio/moz.build
+++ b/content/media/webaudio/moz.build
@@ -79,13 +79,11 @@ SOURCES += [
     'ScriptProcessorNode.cpp',
     'ThreeDPoint.cpp',
     'WaveShaperNode.cpp',
     'WebAudioUtils.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'gkconwebaudio_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/media/webm/moz.build
+++ b/content/media/webm/moz.build
@@ -10,13 +10,11 @@ EXPORTS += [
 ]
 
 UNIFIED_SOURCES += [
     'WebMBufferedParser.cpp',
     'WebMDecoder.cpp',
     'WebMReader.cpp',
 ]
 
-LIBRARY_NAME = 'gkconwebm_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/media/webrtc/moz.build
+++ b/content/media/webrtc/moz.build
@@ -34,15 +34,13 @@ if CONFIG['MOZ_WEBRTC']:
 XPIDL_SOURCES += [
     'nsITabSource.idl'
 ]
 
 UNIFIED_SOURCES += [
     'MediaEngineDefault.cpp',
 ]
 
-LIBRARY_NAME = 'gkconwebrtc_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 if CONFIG['OS_ARCH'] == 'WINNT':
     DEFINES['NOMINMAX'] = True
--- a/content/media/webspeech/recognition/moz.build
+++ b/content/media/webspeech/recognition/moz.build
@@ -33,17 +33,15 @@ UNIFIED_SOURCES += [
     'SpeechRecognition.cpp',
     'SpeechRecognitionAlternative.cpp',
     'SpeechRecognitionResult.cpp',
     'SpeechRecognitionResultList.cpp',
     'SpeechStreamListener.cpp',
     'test/FakeSpeechRecognitionService.cpp',
 ]
 
-LIBRARY_NAME = 'gkconwebspeechrecognition_s'
-
 LOCAL_INCLUDES += [
     '/dom/base',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/media/webspeech/synth/moz.build
+++ b/content/media/webspeech/synth/moz.build
@@ -42,16 +42,14 @@ if CONFIG['MOZ_WEBSPEECH']:
 
 IPDL_SOURCES += [
     'ipc/PSpeechSynthesis.ipdl',
     'ipc/PSpeechSynthesisRequest.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'gkconwebspeechsynth_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     'ipc',
 ]
--- a/content/media/webspeech/synth/pico/moz.build
+++ b/content/media/webspeech/synth/pico/moz.build
@@ -3,14 +3,12 @@
 # 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/.
 
 SOURCES += [
     'nsPicoService.cpp',
     'PicoModule.cpp'
 ]
-
-LIBRARY_NAME = 'synthpico'
 FAIL_ON_WARNINGS = True
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/media/wmf/moz.build
+++ b/content/media/wmf/moz.build
@@ -15,13 +15,11 @@ SOURCES += [
     'DXVA2Manager.cpp',
     'WMFByteStream.cpp',
     'WMFDecoder.cpp',
     'WMFReader.cpp',
     'WMFSourceReaderCallback.cpp',
     'WMFUtils.cpp',
 ]
 
-LIBRARY_NAME = 'gkconwmf_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/smil/moz.build
+++ b/content/smil/moz.build
@@ -56,17 +56,15 @@ SOURCES += [
     'SMILBoolType.cpp',
     'SMILEnumType.cpp',
     'SMILIntegerType.cpp',
     'SMILStringType.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'gkconsmil_s'
-
 LOCAL_INCLUDES += [
     '../base/src',
     '../events/src',
     '/layout/style',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@@ -240,18 +240,16 @@ UNIFIED_SOURCES += [
     'SVGUseElement.cpp',
     'SVGViewBoxSMILType.cpp',
     'SVGViewElement.cpp',
     'SVGZoomEvent.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'gkcontentsvg_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',
     '/content/html/content/src',
     '/content/smil',
--- a/content/svg/document/src/moz.build
+++ b/content/svg/document/src/moz.build
@@ -7,18 +7,16 @@
 EXPORTS.mozilla.dom += [
     'SVGDocument.h',
 ]
 
 SOURCES += [
     'SVGDocument.cpp',
 ]
 
-LIBRARY_NAME = 'gkconsvgdoc_s'
-
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',
     '/content/html/document/src',
     '/content/svg/content/src',
     '/content/xml/document/src',
--- a/content/xbl/src/moz.build
+++ b/content/xbl/src/moz.build
@@ -33,18 +33,16 @@ SOURCES += [
     'nsXBLWindowKeyHandler.cpp',
     'XBLChildrenElement.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'gkconxbl_s'
-
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',
     '/content/html/document/src',
     '/content/xml/document/src',
     '/content/xul/content/src',
     '/content/xul/document/src',
     '/dom/base',
--- a/content/xml/content/src/moz.build
+++ b/content/xml/content/src/moz.build
@@ -13,18 +13,16 @@ EXPORTS.mozilla.dom += [
 
 SOURCES += [
     'CDATASection.cpp',
     'nsXMLElement.cpp',
     'ProcessingInstruction.cpp',
     'XMLStylesheetProcessingInstruction.cpp',
 ]
 
-LIBRARY_NAME = 'gkconxmlcon_s'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
 ]
--- a/content/xml/document/src/moz.build
+++ b/content/xml/document/src/moz.build
@@ -10,18 +10,16 @@ EXPORTS.mozilla.dom += [
 
 SOURCES += [
     'nsXMLContentSink.cpp',
     'nsXMLFragmentContentSink.cpp',
     'nsXMLPrettyPrinter.cpp',
     'XMLDocument.cpp',
 ]
 
-LIBRARY_NAME = 'gkconxmldoc_s'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/caps/include',
     '/content/base/src',
     '/content/events/src',
--- a/content/xslt/src/base/moz.build
+++ b/content/xslt/src/base/moz.build
@@ -7,18 +7,16 @@
 SOURCES += [
     'txDouble.cpp',
     'txExpandedNameMap.cpp',
     'txList.cpp',
     'txNamespaceMap.cpp',
     'txURIUtils.cpp',
 ]
 
-LIBRARY_NAME = 'txbase_s'
-
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../../public',
     '../xml',
     '../xpath',
     '../xslt',
 ]
--- a/content/xslt/src/xml/moz.build
+++ b/content/xslt/src/xml/moz.build
@@ -4,18 +4,16 @@
 # 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/.
 
 SOURCES += [
     'txXMLParser.cpp',
     'txXMLUtils.cpp',
 ]
 
-LIBRARY_NAME = 'txxml_s'
-
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../base',
     '../xpath',
     '../xslt',
     '/content/base/src',
 ]
--- a/content/xslt/src/xpath/moz.build
+++ b/content/xslt/src/xpath/moz.build
@@ -44,18 +44,16 @@ SOURCES += [
     'txUnionExpr.cpp',
     'txUnionNodeTest.cpp',
     'txVariableRefExpr.cpp',
     'txXPathOptimizer.cpp',
     'txXPCOMExtensionFunction.cpp',
     'XPathEvaluator.cpp',
 ]
 
-LIBRARY_NAME = 'txxpath_s'
-
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../base',
     '../xml',
     '../xslt',
 ]
 
--- a/content/xslt/src/xslt/moz.build
+++ b/content/xslt/src/xslt/moz.build
@@ -37,18 +37,16 @@ SOURCES += [
     'txXSLTProcessor.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'txEXSLTRegExFunctions.js',
     'txEXSLTRegExFunctions.manifest',
 ]
 
-LIBRARY_NAME = 'txxslt_s'
-
 FAIL_ON_WARNINGS = True
 
 # For nsDependentJSString
 LOCAL_INCLUDES += ["/dom/base"]
 
 LOCAL_INCLUDES += [
     '../base',
     '../xml',
--- a/content/xul/content/src/moz.build
+++ b/content/xul/content/src/moz.build
@@ -7,17 +7,16 @@
 if CONFIG['MOZ_XUL']:
     MSVC_ENABLE_PGO = True
 
     SOURCES += [
         'nsXULContextMenuBuilder.cpp',
         'nsXULElement.cpp',
         'nsXULPopupListener.cpp',
     ]
-    LIBRARY_NAME = 'gkconxulcon_s'
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../../document/src',
     '../../templates/src',
     '/content/base/src',
     '/content/events/src',
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@@ -12,18 +12,16 @@ if CONFIG['MOZ_XUL']:
     SOURCES += [
         'nsXULCommandDispatcher.cpp',
         'nsXULContentSink.cpp',
         'nsXULPrototypeCache.cpp',
         'nsXULPrototypeDocument.cpp',
         'XULDocument.cpp',
     ]
 
-LIBRARY_NAME = 'gkconxuldoc_s'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',
     '/content/xbl/src',
--- a/content/xul/templates/src/moz.build
+++ b/content/xul/templates/src/moz.build
@@ -28,18 +28,16 @@ SOURCES += [
     'nsXULTemplateQueryProcessorXML.cpp',
     'nsXULTemplateResultRDF.cpp',
     'nsXULTemplateResultSetRDF.cpp',
     'nsXULTemplateResultStorage.cpp',
     'nsXULTemplateResultXML.cpp',
     'nsXULTreeBuilder.cpp',
 ]
 
-LIBRARY_NAME = 'gkconxultmpl_s'
-
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../../content/src',
     '/content/base/src',
     '/dom/base',
     '/layout/xul/tree/',
 ]
--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -61,18 +61,16 @@ SOURCES += [
     'nsWebNavigationInfo.cpp',
     'SerializedLoadContext.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'basedocshell_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../shistory/src',
     '/content/base/src',
     '/dom/base',
     '/layout/base',
--- a/docshell/build/moz.build
+++ b/docshell/build/moz.build
@@ -7,18 +7,16 @@
 EXPORTS += [
     'nsDocShellCID.h',
 ]
 
 SOURCES += [
     'nsDocShellModule.cpp',
 ]
 
-LIBRARY_NAME = 'docshell'
-
 LOCAL_INCLUDES += [
     '../base',
     '../shistory/src/',
     '/uriloader/base',
     '/uriloader/exthandler',
     '/uriloader/prefetch',
     ]
 
--- a/docshell/shistory/src/moz.build
+++ b/docshell/shistory/src/moz.build
@@ -10,18 +10,16 @@ EXPORTS += [
 
 SOURCES += [
     'nsSHEntry.cpp',
     'nsSHEntryShared.cpp',
     'nsSHistory.cpp',
     'nsSHTransaction.cpp',
 ]
 
-LIBRARY_NAME = 'shistory_s'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/docshell/base',
 ]
 
--- a/dom/activities/src/moz.build
+++ b/dom/activities/src/moz.build
@@ -23,15 +23,13 @@ EXTRA_COMPONENTS += [
 
 EXTRA_JS_MODULES += [
     'ActivitiesService.jsm',
     'ActivitiesServiceFilter.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'dom_activities_s'
-
 LOCAL_INCLUDES += [
     '/dom/base',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/alarm/moz.build
+++ b/dom/alarm/moz.build
@@ -28,13 +28,11 @@ EXTRA_COMPONENTS += [
 
 EXTRA_JS_MODULES += [
     'AlarmDB.jsm',
     'AlarmService.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'domalarm_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/apps/src/moz.build
+++ b/dom/apps/src/moz.build
@@ -35,16 +35,14 @@ EXTRA_JS_MODULES += [
 EXTRA_PP_JS_MODULES += [
     'AppsUtils.jsm',
     'OperatorApps.jsm',
     'Webapps.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'dom_apps_s'
-
 FINAL_LIBRARY = 'gklayout'
 
 LOCAL_INCLUDES += [
     '/js/xpconnect/wrappers',
 ]
 
--- a/dom/audiochannel/moz.build
+++ b/dom/audiochannel/moz.build
@@ -22,13 +22,11 @@ EXPORTS += [
 SOURCES += [
     'AudioChannelAgent.cpp',
     'AudioChannelService.cpp',
     'AudioChannelServiceChild.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'domaudiochannel_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -115,18 +115,16 @@ EXTRA_JS_MODULES += [
     'IndexedDBHelper.jsm',
     'ObjectWrapper.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'jsdombase_s'
-
 LOCAL_INCLUDES += [
     '../battery',
     '../bluetooth',
     '../media',
     '../network/src',
     '../src/geolocation',
     '../src/storage',
     '../time',
--- a/dom/battery/moz.build
+++ b/dom/battery/moz.build
@@ -12,17 +12,15 @@ EXPORTS.mozilla.dom.battery += [
 ]
 
 SOURCES += [
     'BatteryManager.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'dom_battery_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/events/src',
 ]
 
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -30,18 +30,16 @@ EXPORTS.mozilla.dom += [
     'TypedArray.h',
     'UnionMember.h',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'dombindings_s'
-
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/canvas/src',
     '/content/events/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/media/webaudio',
     '/content/media/webspeech/recognition',
--- a/dom/bluetooth/moz.build
+++ b/dom/bluetooth/moz.build
@@ -2,17 +2,16 @@
 # vim: set filetype=python:
 # 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/.
 
 if CONFIG['MOZ_B2G_BT']:
     PARALLEL_DIRS += ['interfaces']
 
-    LIBRARY_NAME = 'dombluetooth_s'
 
     SOURCES += [
         'BluetoothA2dpManager.cpp',
         'BluetoothAdapter.cpp',
         'BluetoothDevice.cpp',
         'BluetoothHidManager.cpp',
         'BluetoothManager.cpp',
         'BluetoothOppManager.cpp',
--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@@ -23,18 +23,16 @@ EXTRA_COMPONENTS += [
 
 EXTRA_JS_MODULES += [
     'BrowserElementParent.jsm',
     'BrowserElementPromptService.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'dom_browserelement_s'
-
 LOCAL_INCLUDES += [
     '../bluetooth',
     '/content/html/content/src',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/camera/moz.build
+++ b/dom/camera/moz.build
@@ -42,17 +42,15 @@ if CONFIG['MOZ_B2G_CAMERA']:
 else:
     SOURCES += [
         'FallbackCameraControl.cpp',
         'FallbackCameraManager.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'domcamera_s'
-
 LOCAL_INCLUDES += [
     '../base',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/cellbroadcast/src/moz.build
+++ b/dom/cellbroadcast/src/moz.build
@@ -11,11 +11,9 @@ EXPORTS.mozilla.dom += [
 ]
 
 SOURCES += [
     'CellBroadcast.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'dom_cellbroadcast_s'
-
 FINAL_LIBRARY = 'gklayout'
--- a/dom/devicestorage/moz.build
+++ b/dom/devicestorage/moz.build
@@ -25,18 +25,16 @@ SOURCES += [
 ]
 
 IPDL_SOURCES += [
     'PDeviceStorageRequest.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'domdevicestorage_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',
     '/dom/base',
     '/dom/ipc',
--- a/dom/encoding/moz.build
+++ b/dom/encoding/moz.build
@@ -17,15 +17,13 @@ SOURCES += [
     'EncodingUtils.cpp',
     'FallbackEncoding.cpp',
     'TextDecoder.cpp',
     'TextEncoder.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'domencoding_s'
-
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/intl/locale/src',
 ]
 
--- a/dom/file/moz.build
+++ b/dom/file/moz.build
@@ -50,15 +50,13 @@ SOURCES += [
     'FileStreamWrappers.cpp',
     'LockedFile.cpp',
     'MemoryStreams.cpp',
     'MetadataHelper.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'domfile_s'
-
 LOCAL_INCLUDES += [
     '../base',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/fmradio/moz.build
+++ b/dom/fmradio/moz.build
@@ -15,18 +15,16 @@ if CONFIG['MOZ_B2G_FM']:
         'FMRadioService.h',
     ]
 
     SOURCES += [
         'FMRadio.cpp',
         'FMRadioService.cpp',
     ]
 
-    LIBRARY_NAME = 'domfmradio_s'
-
     FINAL_LIBRARY = 'gklayout'
 
 IPDL_SOURCES += [
     'ipc/PFMRadio.ipdl',
     'ipc/PFMRadioRequest.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
--- a/dom/gamepad/moz.build
+++ b/dom/gamepad/moz.build
@@ -13,17 +13,15 @@ EXPORTS.mozilla.dom += [
 SOURCES = [
     'Gamepad.cpp',
     'GamepadButton.cpp',
     'GamepadService.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'domgamepad_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/dom/base',
 ]
 
--- a/dom/icc/src/moz.build
+++ b/dom/icc/src/moz.build
@@ -9,17 +9,15 @@ EXPORTS.mozilla.dom += [
 ]
 
 SOURCES += [
     'IccManager.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'dom_icc_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/events/src',
 ]
 
--- a/dom/indexedDB/ipc/moz.build
+++ b/dom/indexedDB/ipc/moz.build
@@ -25,18 +25,16 @@ IPDL_SOURCES += [
     'PIndexedDBIndex.ipdl',
     'PIndexedDBObjectStore.ipdl',
     'PIndexedDBRequest.ipdl',
     'PIndexedDBTransaction.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'dom_indexeddb_ipc_s'
-
 MOCHITEST_MANIFESTS += ['mochitest.ini']
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/events/src',
     '/dom/indexedDB',
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@@ -57,18 +57,16 @@ SOURCES += [
     'Key.cpp',
     'KeyPath.cpp',
     'OpenDatabaseHelper.cpp',
     'TransactionThreadPool.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'dom_indexeddb_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/caps/include',
     '/content/base/src',
     '/content/events/src',
     '/db/sqlite3/src',
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -66,18 +66,16 @@ IPDL_SOURCES += [
     'PCrashReporter.ipdl',
     'PDocumentRenderer.ipdl',
     'PMemoryReportRequest.ipdl',
     'PTabContext.ipdlh',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'domipc_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../src/base',
     '../src/geolocation',
     '../src/storage',
     '/chrome/src',
--- a/dom/media/bridge/moz.build
+++ b/dom/media/bridge/moz.build
@@ -20,11 +20,9 @@ LOCAL_INCLUDES += [
     '/media/webrtc/signaling/include',
     '/media/webrtc/signaling/src/common/time_profiling',
     '/media/webrtc/signaling/src/media-conduit',
     '/media/webrtc/signaling/src/mediapipeline',
     '/media/webrtc/signaling/src/peerconnection',
     '/media/webrtc/signaling/src/sipcc/include',
 ]
 
-LIBRARY_NAME = 'peerconnection'
-
 FINAL_LIBRARY = 'xul'
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -45,18 +45,16 @@ if CONFIG['MOZ_B2G']:
         'MediaPermissionGonk.h',
     ]
     SOURCES += [
         'MediaPermissionGonk.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'dom_media_s'
-
 LOCAL_INCLUDES += [
     '../base',
     '../camera',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/mobilemessage/src/moz.build
+++ b/dom/mobilemessage/src/moz.build
@@ -66,17 +66,15 @@ IPDL_SOURCES += [
     'ipc/PSmsRequest.ipdl',
     'ipc/SmsTypes.ipdlh',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'dom_mobilemessage_s'
-
 LOCAL_INCLUDES += [
     '/dom/base',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/network/src/moz.build
+++ b/dom/network/src/moz.build
@@ -62,17 +62,15 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
 IPDL_SOURCES += [
     'PTCPServerSocket.ipdl',
     'PTCPSocket.ipdl',
     'PUDPSocket.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'dom_network_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/events/src',
 ]
 
--- a/dom/nfc/moz.build
+++ b/dom/nfc/moz.build
@@ -14,11 +14,9 @@ if CONFIG['MOZ_NFC']:
     ]
     EXTRA_COMPONENTS += [
       'nsNfc.js',
       'nsNfc.manifest',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'dom_nfc_s'
-
 FINAL_LIBRARY = 'gklayout'
--- a/dom/plugins/base/android/moz.build
+++ b/dom/plugins/base/android/moz.build
@@ -20,18 +20,16 @@ SOURCES += [
     'ANPSurface.cpp',
     'ANPSystem.cpp',
     'ANPVideo.cpp',
     'ANPWindow.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'gkpluginandroid_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/dom/plugins/base',
     '/dom/plugins/base/android/include',
     '/gfx/gl',
     '/widget/android',
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -92,18 +92,16 @@ else:
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     # android_npapi.h extends the NPNVariable and NPPVariable enums
     # using #defines, which results in Wswitch warnings in gcc-4.6.
     # Therefore, enable FAIL_ON_WARNINGS only on non-Android platforms.
     FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'gkplugin'
-
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/dom/base',
     '/gfx/skia/include/config',
     '/gfx/skia/include/core',
     '/layout/generic',
     '/layout/xul/base/src',
     '/widget/android',
--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@@ -107,18 +107,16 @@ IPDL_SOURCES += [
     'PPluginScriptableObject.ipdl',
     'PPluginStream.ipdl',
     'PPluginSurface.ipdl',
     'PStreamNotify.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'domplugins_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../base',
     '/xpcom/base/',
 ]
 
--- a/dom/power/moz.build
+++ b/dom/power/moz.build
@@ -27,13 +27,11 @@ EXPORTS.mozilla.dom.power += [
 SOURCES += [
     'PowerManager.cpp',
     'PowerManagerService.cpp',
     'WakeLock.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'dom_power_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/promise/moz.build
+++ b/dom/promise/moz.build
@@ -14,16 +14,14 @@ EXPORTS.mozilla.dom += [
 
 SOURCES += [
     'Promise.cpp',
     'PromiseCallback.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'dompromise_s'
-
 LOCAL_INCLUDES += [
     '../base',
     '../workers',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/quota/moz.build
+++ b/dom/quota/moz.build
@@ -37,17 +37,15 @@ SOURCES += [
     'QuotaManager.cpp',
     'QuotaObject.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'domquota_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/caps/include',
 ]
 
--- a/dom/src/events/moz.build
+++ b/dom/src/events/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 SOURCES += [
     'nsJSEventListener.cpp',
 ]
 
-LIBRARY_NAME = 'jsdomevents_s'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     "/content/base/src",
     "/dom/base",
 ]
--- a/dom/src/geolocation/moz.build
+++ b/dom/src/geolocation/moz.build
@@ -11,18 +11,16 @@ EXPORTS += [
 
 SOURCES += [
     'nsGeolocation.cpp',
     'nsGeoPosition.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'jsdomgeolocation_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',
     '/dom/base',
     '/dom/ipc',
--- a/dom/src/json/moz.build
+++ b/dom/src/json/moz.build
@@ -9,17 +9,15 @@ TEST_DIRS += ['test']
 EXPORTS += [
     'nsJSON.h',
 ]
 
 SOURCES += [
     'nsJSON.cpp',
 ]
 
-LIBRARY_NAME = 'json_s'
-
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/src/jsurl/moz.build
+++ b/dom/src/jsurl/moz.build
@@ -9,18 +9,16 @@ TEST_DIRS += ['test']
 EXPORTS += [
     'nsJSProtocolHandler.h',
 ]
 
 SOURCES += [
     'nsJSProtocolHandler.cpp',
 ]
 
-LIBRARY_NAME = 'jsurl_s'
-
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     "/dom/base",
     "/netwerk/base/src",
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/src/notification/moz.build
+++ b/dom/src/notification/moz.build
@@ -20,18 +20,16 @@ EXPORTS.mozilla.dom += [
 
 SOURCES += [
     'DesktopNotification.cpp',
     'Notification.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'jsdomnotification_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',
     '/dom/base',
     '/dom/ipc',
--- a/dom/src/offline/moz.build
+++ b/dom/src/offline/moz.build
@@ -6,18 +6,16 @@
 
 EXPORTS += [
     'nsDOMOfflineResourceList.h',
 ]
 SOURCES += [
     'nsDOMOfflineResourceList.cpp',
 ]
 
-LIBRARY_NAME = 'jsdomoffline_s'
-
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     "/content/base/src",
     "/content/events/src",
     "/dom/base",
 ]
 
--- a/dom/src/storage/moz.build
+++ b/dom/src/storage/moz.build
@@ -20,18 +20,16 @@ SOURCES += [
 IPDL_SOURCES += [
     'PStorage.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'jsdomstorage_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/events/src',
     '/dom/base',
 ]
 
--- a/dom/system/android/moz.build
+++ b/dom/system/android/moz.build
@@ -6,18 +6,16 @@
 
 SOURCES += [
     'AndroidLocationProvider.cpp',
     'nsHapticFeedback.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'domsystemandroid_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/events/src',
     '/dom/src/geolocation',
 ]
 
--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@@ -107,18 +107,16 @@ if CONFIG['MOZ_B2G_BT_BLUEZ']:
     ]
 elif CONFIG['MOZ_B2G_BT_BLUEDROID']:
     LOCAL_INCLUDES += [
         '/dom/bluetooth/bluedroid',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'domsystemgonk_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '/content/events/src',
     '/dom/base',
     '/dom/bluetooth',
     '/dom/nfc',
     '/dom/src/geolocation',
--- a/dom/system/mac/moz.build
+++ b/dom/system/mac/moz.build
@@ -3,17 +3,15 @@
 # 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/.
 
 SOURCES += ['CoreLocationLocationProvider.mm']
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'domsystemmac_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/dom/src/geolocation',
 ]
 
--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -43,18 +43,16 @@ SOURCES += [
 if CONFIG['OS_TARGET'] != 'Android' or CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     EXTRA_COMPONENTS += [
         'NetworkGeolocationProvider.js',
         'NetworkGeolocationProvider.manifest',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'domsystem_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += [
     '/content/events/src',
     '/dom/base',
     '/dom/bindings',
--- a/dom/system/unix/moz.build
+++ b/dom/system/unix/moz.build
@@ -13,13 +13,11 @@ if CONFIG['MOZ_ENABLE_QTMOBILITY']:
     ]
 
     LOCAL_INCLUDES += [
         '/dom/src/geolocation',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'domsystemunix_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/system/windows/moz.build
+++ b/dom/system/windows/moz.build
@@ -10,11 +10,9 @@ SOURCES += [
 
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += [
     '/content/events/src',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'domsystemwindows_s'
-
 FINAL_LIBRARY = 'gklayout'
--- a/dom/telephony/moz.build
+++ b/dom/telephony/moz.build
@@ -48,13 +48,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
         'nsIGonkTelephonyProvider.idl',
     ]
     EXTRA_COMPONENTS += [
         'gonk/TelephonyProvider.js',
         'gonk/TelephonyProvider.manifest',
     ]
 
 FAIL_ON_WARNINGS = True
-
-LIBRARY_NAME = 'domtelephony_s'
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/time/moz.build
+++ b/dom/time/moz.build
@@ -21,13 +21,11 @@ SOURCES += [
     'DateCacheCleaner.cpp',
     'TimeChangeObserver.cpp',
     'TimeManager.cpp',
     'TimeService.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'dom_time_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/voicemail/moz.build
+++ b/dom/voicemail/moz.build
@@ -17,15 +17,13 @@ EXPORTS.mozilla.dom += [
 ]
 
 SOURCES += [
     'Voicemail.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'domvoicemail_s'
-
 LOCAL_INCLUDES += [
     '../base',
 ]
 
 FINAL_LIBRARY = 'gklayout'
--- a/dom/wifi/moz.build
+++ b/dom/wifi/moz.build
@@ -27,11 +27,9 @@ EXTRA_JS_MODULES += [
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     SOURCES = [
         'NetUtils.cpp',
         'WifiProxyService.cpp',
         'WifiUtils.cpp',
     ]
 
-LIBRARY_NAME = 'domwifi_s'
-
 FINAL_LIBRARY = 'xul'
--- a/dom/workers/moz.build
+++ b/dom/workers/moz.build
@@ -43,18 +43,16 @@ SOURCES += [
     'SharedWorker.cpp',
     'URL.cpp',
     'WorkerPrivate.cpp',
     'WorkerScope.cpp',
     'XMLHttpRequest.cpp',
     'XMLHttpRequestUpload.cpp',
 ]
 
-LIBRARY_NAME = 'domworkers_s'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../base',
     '../system',
     '/content/base/src',
--- a/editor/composer/src/moz.build
+++ b/editor/composer/src/moz.build
@@ -10,13 +10,11 @@ UNIFIED_SOURCES += [
     'nsComposerController.cpp',
     'nsComposerDocumentCommands.cpp',
     'nsComposerRegistration.cpp',
     'nsComposeTxtSrvFilter.cpp',
     'nsEditingSession.cpp',
     'nsEditorSpellCheck.cpp',
 ]
 
-LIBRARY_NAME = 'composer'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
--- a/editor/libeditor/base/moz.build
+++ b/editor/libeditor/base/moz.build
@@ -26,18 +26,16 @@ UNIFIED_SOURCES += [
     'nsEditorUtils.cpp',
     'nsSelectionState.cpp',
     'nsStyleSheetTxns.cpp',
     'PlaceholderTxn.cpp',
     'SetDocTitleTxn.cpp',
     'SplitElementTxn.cpp',
 ]
 
-LIBRARY_NAME = 'editorbase_s'
-
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../text',
     '/content/base/src',
     '/content/events/src',
     '/editor/txmgr/src',
     '/extensions/spellcheck/src',
--- a/editor/libeditor/html/moz.build
+++ b/editor/libeditor/html/moz.build
@@ -21,18 +21,16 @@ UNIFIED_SOURCES += [
     'nsHTMLObjectResizer.cpp',
     'nsHTMLURIRefObject.cpp',
     'nsTableEditor.cpp',
     'nsWSRunObject.cpp',
     'TextEditorTest.cpp',
     'TypeInState.cpp',
 ]
 
-LIBRARY_NAME = 'htmleditor_s'
-
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../base',
     '../text',
     '/content/base/src',
     '/editor/txmgr/src',
     '/layout/generic',
--- a/editor/libeditor/text/moz.build
+++ b/editor/libeditor/text/moz.build
@@ -10,18 +10,16 @@ UNIFIED_SOURCES += [
     'nsInternetCiter.cpp',
     'nsPlaintextDataTransfer.cpp',
     'nsPlaintextEditor.cpp',
     'nsTextEditRules.cpp',
     'nsTextEditRulesBidi.cpp',
     'nsTextEditUtils.cpp',
 ]
 
-LIBRARY_NAME = 'texteditor_s'
-
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '../base',
     '/content/base/src',
     '/editor/txmgr/src',
 ]
 
--- a/editor/txmgr/src/moz.build
+++ b/editor/txmgr/src/moz.build
@@ -7,13 +7,11 @@
 UNIFIED_SOURCES += [
     'nsTransactionItem.cpp',
     'nsTransactionList.cpp',
     'nsTransactionManager.cpp',
     'nsTransactionManagerFactory.cpp',
     'nsTransactionStack.cpp',
 ]
 
-LIBRARY_NAME = 'txmgr'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
--- a/editor/txtsvc/src/moz.build
+++ b/editor/txtsvc/src/moz.build
@@ -4,13 +4,11 @@
 # 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/.
 
 UNIFIED_SOURCES += [
     'nsFilteredContentIterator.cpp',
     'nsTextServicesDocument.cpp',
 ]
 
-LIBRARY_NAME = 'txtsvc_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
--- a/embedding/browser/webBrowser/moz.build
+++ b/embedding/browser/webBrowser/moz.build
@@ -39,18 +39,16 @@ SOURCES += [
     'nsCommandHandler.cpp',
     'nsContextMenuInfo.cpp',
     'nsDocShellTreeOwner.cpp',
     'nsEmbedStream.cpp',
     'nsWebBrowser.cpp',
     'nsWebBrowserContentPolicy.cpp',
 ]
 
-LIBRARY_NAME = 'nsWebBrowser_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'webbrwsr'
 LOCAL_INCLUDES += [
     '../../../content/base/src',
     '../../../content/svg/content/src',
 ]
 
--- a/embedding/components/appstartup/src/moz.build
+++ b/embedding/components/appstartup/src/moz.build
@@ -7,13 +7,11 @@
 EXPORTS += [
     'nsIAppStartupNotifier.h',
 ]
 
 SOURCES += [
     'nsAppStartupNotifier.cpp',
 ]
 
-LIBRARY_NAME = 'appstartupnotifier_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'embedcomponents'
--- a/embedding/components/commandhandler/src/moz.build
+++ b/embedding/components/commandhandler/src/moz.build
@@ -7,13 +7,11 @@
 SOURCES += [
     'nsBaseCommandController.cpp',
     'nsCommandGroup.cpp',
     'nsCommandManager.cpp',
     'nsCommandParams.cpp',
     'nsControllerCommandTable.cpp',
 ]
 
-LIBRARY_NAME = 'commandhandler_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'embedcomponents'
--- a/embedding/components/find/src/moz.build
+++ b/embedding/components/find/src/moz.build
@@ -4,13 +4,11 @@
 # 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/.
 
 SOURCES += [
     'nsFind.cpp',
     'nsWebBrowserFind.cpp',
 ]
 
-LIBRARY_NAME = 'find_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'embedcomponents'
--- a/embedding/components/printingui/src/mac/moz.build
+++ b/embedding/components/printingui/src/mac/moz.build
@@ -4,17 +4,15 @@
 # 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/.
 
 SOURCES += [
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
 ]
 
-LIBRARY_NAME = 'printingui_s'
-
 SOURCES += [
     'nsPrintingPromptServiceX.mm',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'embedcomponents'
--- a/embedding/components/printingui/src/os2/moz.build
+++ b/embedding/components/printingui/src/os2/moz.build
@@ -5,11 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsPrintingPromptService.cpp',
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
 ]
 
-LIBRARY_NAME = 'printingui_s'
-
 FINAL_LIBRARY = 'embedcomponents'
--- a/embedding/components/printingui/src/unixshared/moz.build
+++ b/embedding/components/printingui/src/unixshared/moz.build
@@ -5,13 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsPrintingPromptService.cpp',
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
 ]
 
-LIBRARY_NAME = 'printingui_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'embedcomponents'
--- a/embedding/components/printingui/src/win/moz.build
+++ b/embedding/components/printingui/src/win/moz.build
@@ -6,13 +6,11 @@
 
 SOURCES += [
     'nsPrintDialogUtil.cpp',
     'nsPrintingPromptService.cpp',
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
 ]
 
-LIBRARY_NAME = 'printingui_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'embedcomponents'
--- a/embedding/components/webbrowserpersist/src/moz.build
+++ b/embedding/components/webbrowserpersist/src/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 SOURCES += [
     'nsWebBrowserPersist.cpp',
 ]
 
-LIBRARY_NAME = 'webbrowserpersist_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'embedcomponents'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
 ]
 
--- a/embedding/components/windowwatcher/src/moz.build
+++ b/embedding/components/windowwatcher/src/moz.build
@@ -9,18 +9,16 @@ SOURCES += [
     'nsWindowWatcher.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
     SOURCES += [
         'nsDialogParamBlock.cpp',
     ]
 
-LIBRARY_NAME = 'windowwatcher_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'embedcomponents'
 # For nsJSUtils
 LOCAL_INCLUDES += [
     '/dom/base',
 ]
 
--- a/extensions/auth/moz.build
+++ b/extensions/auth/moz.build
@@ -16,11 +16,9 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         'nsAuthSSPI.cpp',
     ]
     DEFINES['USE_SSPI'] = True
 else:
     SOURCES += [
         'nsAuthSambaNTLM.cpp',
     ]
 
-LIBRARY_NAME = 'auth'
-
 FINAL_LIBRARY = 'xul'
--- a/extensions/cookie/moz.build
+++ b/extensions/cookie/moz.build
@@ -19,13 +19,11 @@ SOURCES += [
     'nsCookiePromptService.cpp',
     'nsPermission.cpp',
     'nsPermissionManager.cpp',
     'nsPopupWindowManager.cpp',
 ]
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'cookie'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/extensions/gio/moz.build
+++ b/extensions/gio/moz.build
@@ -3,13 +3,11 @@
 # 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/.
 
 SOURCES += [
     'nsGIOProtocolHandler.cpp',
 ]
 
-LIBRARY_NAME = 'nkgio'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
--- a/extensions/permissions/moz.build
+++ b/extensions/permissions/moz.build
@@ -4,11 +4,9 @@
 # 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/.
 
 SOURCES += [
     'nsContentBlocker.cpp',
     'nsModuleFactory.cpp',
 ]
 
-LIBRARY_NAME = 'permissions'
-
 FINAL_LIBRARY = 'xul'
--- a/extensions/pref/autoconfig/src/moz.build
+++ b/extensions/pref/autoconfig/src/moz.build
@@ -6,11 +6,9 @@
 
 SOURCES += [
     'nsAutoConfig.cpp',
     'nsConfigFactory.cpp',
     'nsJSConfigTriggers.cpp',
     'nsReadConfig.cpp',
 ]
 
-LIBRARY_NAME = 'autoconfig'
-
 FINAL_LIBRARY = 'xul'
--- a/extensions/spellcheck/hunspell/src/moz.build
+++ b/extensions/spellcheck/hunspell/src/moz.build
@@ -19,11 +19,9 @@ if not CONFIG['MOZ_NATIVE_HUNSPELL']:
         'hashmgr.cpp',
         'hunspell.cpp',
         'hunzip.cpp',
         'phonet.cpp',
         'replist.cpp',
         'suggestmgr.cpp',
     ]
 
-LIBRARY_NAME = 'hunspell_s'
-
 FINAL_LIBRARY = 'spellchecker'
--- a/extensions/universalchardet/src/base/moz.build
+++ b/extensions/universalchardet/src/base/moz.build
@@ -27,11 +27,9 @@ SOURCES += [
     'nsMBCSSM.cpp',
     'nsSBCharSetProber.cpp',
     'nsSBCSGroupProber.cpp',
     'nsSJISProber.cpp',
     'nsUniversalDetector.cpp',
     'nsUTF8Prober.cpp',
 ]
 
-LIBRARY_NAME = 'universalchardet_s'
-
 FINAL_LIBRARY = 'universalchardet'
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -105,13 +105,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
         'MacIOSurface.cpp',
         'QuartzSupport.mm',
     ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'gfx2d'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gkmedias'
--- a/gfx/angle/moz.build
+++ b/gfx/angle/moz.build
@@ -112,16 +112,14 @@ UNIFIED_SOURCES += ['src/compiler/' + sr
     'OutputESSL.cpp',
     'OutputGLSL.cpp',
     'OutputGLSLBase.cpp',
     'ShaderLang.cpp',
     'TranslatorESSL.cpp',
     'TranslatorGLSL.cpp',
     'VersionGLSL.cpp',
 ]]
-
-LIBRARY_NAME = 'angle'
 MSVC_ENABLE_PGO = True
 
 if CONFIG['OS_TARGET'] == 'WINNT':
     NO_VISIBILITY_FLAGS = True
 
 FINAL_LIBRARY = 'gkmedias'
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -107,18 +107,16 @@ if CONFIG['MOZ_ENABLE_CAIRO_FT']:
     EXPORTS.cairo += [
         'cairo-ft.h',
     ]
     SOURCES += [
         'cairo-ft-font.c',
         'cairo-type1-subset.c',
     ]
 
-LIBRARY_NAME = 'mozcairo'
-
 SOURCES += [
     'cairo-analysis-surface.c',
     'cairo-arc.c',
     'cairo-array.c',
     'cairo-atomic.c',
     'cairo-base64-stream.c',
     'cairo-bentley-ottmann-rectangular.c',
     'cairo-bentley-ottmann-rectilinear.c',
--- a/gfx/cairo/libpixman/src/moz.build
+++ b/gfx/cairo/libpixman/src/moz.build
@@ -55,11 +55,9 @@ SOURCES += [
     'pixman-trap.c',
     'pixman-utils.c',
     'pixman-x86.c',
     'pixman.c',
 ]
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'mozlibpixman'
-
 FINAL_LIBRARY = 'gkmedias'
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -107,13 +107,11 @@ SOURCES += [
     'TextureImageEGL.cpp',
     'VBOArena.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'gl'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/gfx/graphite2/src/moz.build
+++ b/gfx/graphite2/src/moz.build
@@ -50,16 +50,14 @@ SOURCES += [
     'Segment.cpp',
     'Silf.cpp',
     'Slot.cpp',
     'Sparse.cpp',
     'TtfUtil.cpp',
     'UtfCodec.cpp',
 ]
 
-LIBRARY_NAME = 'mozgraphite2'
-
 MSVC_ENABLE_PGO = True
 
 if CONFIG['OS_TARGET'] == 'WINNT':
     NO_VISIBILITY_FLAGS = True
 
 FINAL_LIBRARY = 'gkmedias'
--- a/gfx/harfbuzz/src/moz.build
+++ b/gfx/harfbuzz/src/moz.build
@@ -45,13 +45,11 @@ SOURCES += [
     'hb-set.cc',
     'hb-shape-plan.cc',
     'hb-shape.cc',
     'hb-shaper.cc',
     'hb-unicode.cc',
     'hb-warning.cc',
 ]
 
-LIBRARY_NAME = 'mozharfbuzz'
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gkmedias'
--- a/gfx/ipc/moz.build
+++ b/gfx/ipc/moz.build
@@ -21,13 +21,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
         'SharedDIBSurface.cpp',
         'SharedDIBWin.cpp',
     ]
 
 SOURCES += [
     'SharedDIB.cpp',
 ]
 
-LIBRARY_NAME = 'gfxipc_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -292,13 +292,11 @@ IPDL_SOURCES = [
     'ipc/PGrallocBuffer.ipdl',
     'ipc/PImageBridge.ipdl',
     'ipc/PLayer.ipdl',
     'ipc/PLayerTransaction.ipdl',
 ]
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'layers'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'thebes'
--- a/gfx/ots/src/moz.build
+++ b/gfx/ots/src/moz.build
@@ -38,16 +38,14 @@ SOURCES += [
     'prep.cc',
     'svg.cc',
     'vdmx.cc',
     'vhea.cc',
     'vmtx.cc',
     'vorg.cc',
 ]
 
-LIBRARY_NAME = 'mozots'
-
 MSVC_ENABLE_PGO = True
 
 if CONFIG['OS_TARGET'] == 'WINNT':
     NO_VISIBILITY_FLAGS = True
 
 FINAL_LIBRARY = 'gkmedias'
--- a/gfx/qcms/moz.build
+++ b/gfx/qcms/moz.build
@@ -4,18 +4,16 @@
 # 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/.
 
 EXPORTS += [
     'qcms.h',
     'qcmstypes.h',
 ]
 
-LIBRARY_NAME = 'mozqcms'
-
 SOURCES += [
     'chain.c',
     'iccread.c',
     'matrix.c',
     'transform.c',
     'transform_util.c',
 ]
 
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -578,13 +578,11 @@ else:
 
 
 # left out of UNIFIED_SOURCES for now; that's not C++ anyway, nothing else to unify it with
 if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
     SOURCES += [
         'src/opts/memset.arm.S',
     ]
 
-LIBRARY_NAME = 'skia'
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gkmedias'
--- a/gfx/src/moz.build
+++ b/gfx/src/moz.build
@@ -54,15 +54,13 @@ SOURCES += [
     'nsRegion.cpp',
     'nsRenderingContext.cpp',
     'nsScriptableRegion.cpp',
     'nsThebesFontEnumerator.cpp',
     'nsThebesGfxFactory.cpp',
     'nsTransform2D.cpp',
 ]
 
-LIBRARY_NAME = 'gkgfx'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
--- a/gfx/ycbcr/moz.build
+++ b/gfx/ycbcr/moz.build
@@ -62,11 +62,9 @@ else:
 if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
     SOURCES += [
         'yuv_row_arm.s',
     ]
     SOURCES += [
         'yuv_convert_arm.cpp',
     ]
 
-LIBRARY_NAME = 'ycbcr'
-
 FINAL_LIBRARY = 'xul'
--- a/hal/moz.build
+++ b/hal/moz.build
@@ -155,13 +155,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
     ]
 
 IPDL_SOURCES = [
     'sandbox/PHal.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'hal_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/image/decoders/icon/android/moz.build
+++ b/image/decoders/icon/android/moz.build
@@ -5,13 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'imgiconandroid_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'imgicon'
--- a/image/decoders/icon/gtk/moz.build
+++ b/image/decoders/icon/gtk/moz.build
@@ -3,13 +3,11 @@
 # 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/.
 
 SOURCES += [
     'nsIconChannel.cpp',
 ]
 
-LIBRARY_NAME = 'imgicongtk_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'imgicon'
--- a/image/decoders/icon/mac/moz.build
+++ b/image/decoders/icon/mac/moz.build
@@ -1,15 +1,13 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
-LIBRARY_NAME = 'imgiconmac_s'
-
 SOURCES += [
     'nsIconChannelCocoa.mm',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'imgicon'
--- a/image/decoders/icon/os2/moz.build
+++ b/image/decoders/icon/os2/moz.build
@@ -3,11 +3,9 @@
 # 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/.
 
 SOURCES += [
     'nsIconChannel.cpp',
 ]
 
-LIBRARY_NAME = 'imgiconos2_s'
-
 FINAL_LIBRARY = 'imgicon'
--- a/image/decoders/icon/qt/moz.build
+++ b/image/decoders/icon/qt/moz.build
@@ -13,11 +13,9 @@ SOURCES += [
 EXTRA_COMPONENTS += [
     'gtkqticonsconverter.manifest',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'gtkqticonsconverter.js',
 ]
 
-LIBRARY_NAME = 'imgiconqt_s'
-
 FINAL_LIBRARY = 'imgicon'
--- a/image/decoders/icon/win/moz.build
+++ b/image/decoders/icon/win/moz.build
@@ -3,13 +3,11 @@
 # 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/.
 
 SOURCES += [
     'nsIconChannel.cpp',
 ]
 
-LIBRARY_NAME = 'imgiconwin_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'imgicon'
--- a/image/decoders/moz.build
+++ b/image/decoders/moz.build
@@ -28,18 +28,16 @@ SOURCES += [
     'nsBMPDecoder.cpp',
     'nsGIFDecoder2.cpp',
     'nsICODecoder.cpp',
     'nsIconDecoder.cpp',
     'nsJPEGDecoder.cpp',
     'nsPNGDecoder.cpp',
 ]
 
-LIBRARY_NAME = 'imgdecoders_s'
-
 FAIL_ON_WARNINGS = True
 
 SOURCES += [
     'iccjpeg.c',
 ]
 
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += [
--- a/image/encoders/bmp/moz.build
+++ b/image/encoders/bmp/moz.build
@@ -3,17 +3,15 @@
 # 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/.
 
 SOURCES += [
     'nsBMPEncoder.cpp',
 ]
 
-LIBRARY_NAME = 'imgbmpe_s'
-
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '/image/src',
 ]
 
 FINAL_LIBRARY = 'imglib2'
--- a/image/encoders/ico/moz.build
+++ b/image/encoders/ico/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 SOURCES += [
     'nsICOEncoder.cpp',
 ]
 
-LIBRARY_NAME = 'imgicoe_s'
-
 FAIL_ON_WARNINGS = True
 
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += [
     '../bmp',
     '../png',
     '/image/src',
 ]
--- a/image/encoders/jpeg/moz.build
+++ b/image/encoders/jpeg/moz.build
@@ -3,13 +3,11 @@
 # 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/.
 
 SOURCES += [
     'nsJPEGEncoder.cpp',
 ]
 
-LIBRARY_NAME = 'imgjpege_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'imglib2'
--- a/image/encoders/png/moz.build
+++ b/image/encoders/png/moz.build
@@ -3,17 +3,15 @@
 # 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/.
 
 SOURCES += [
     'nsPNGEncoder.cpp',
 ]
 
-LIBRARY_NAME = 'imgpnge_s'
-
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '/image/src',
 ]
 
 FINAL_LIBRARY = 'imglib2'
--- a/image/src/moz.build
+++ b/image/src/moz.build
@@ -36,13 +36,11 @@ SOURCES += [
     'ScriptedNotificationObserver.cpp',
     'SurfaceCache.cpp',
     'SVGDocumentWrapper.cpp',
     'VectorImage.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'imglib2_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'imglib2'
--- a/intl/chardet/src/moz.build
+++ b/intl/chardet/src/moz.build
@@ -4,11 +4,9 @@
 # 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/.
 
 SOURCES += [
     'nsChardetModule.cpp',
     'nsCyrillicDetector.cpp',
 ]
 
-LIBRARY_NAME = 'chardet'
-
 FINAL_LIBRARY = 'xul'
--- a/intl/hyphenation/src/moz.build
+++ b/intl/hyphenation/src/moz.build
@@ -5,17 +5,15 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'hnjstdio.cpp',
     'nsHyphenationManager.cpp',
     'nsHyphenator.cpp',
 ]
 
-LIBRARY_NAME = 'hyphenation_s'
-
 SOURCES += [
     'hyphen.c',
 ]
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'i18n'
--- a/intl/locale/src/mac/moz.build
+++ b/intl/locale/src/mac/moz.build
@@ -5,11 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsCollationMacUC.cpp',
     'nsDateTimeFormatMac.cpp',
     'nsMacCharset.cpp',
 ]
 
-LIBRARY_NAME = 'platlocale_s'
-
 FINAL_LIBRARY = 'i18n'
--- a/intl/locale/src/moz.build
+++ b/intl/locale/src/moz.build
@@ -22,17 +22,15 @@ SOURCES += [
     'nsCollation.cpp',
     'nsLanguageAtomService.cpp',
     'nsLocale.cpp',
     'nsLocaleService.cpp',
     'nsScriptableDateFormat.cpp',
     'nsUConvPropertySearch.cpp',
 ]
 
-LIBRARY_NAME = 'nslocale_s'
-
 EXTRA_JS_MODULES += [
     'PluralForm.jsm',
 ]
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'i18n'
--- a/intl/locale/src/os2/moz.build
+++ b/intl/locale/src/os2/moz.build
@@ -6,11 +6,9 @@
 
 SOURCES += [
     'nsCollationOS2.cpp',
     'nsDateTimeFormatOS2.cpp',
     'nsOS2Charset.cpp',
     'nsOS2Locale.cpp',
 ]
 
-LIBRARY_NAME = 'platlocale_s'
-
 FINAL_LIBRARY = 'i18n'
--- a/intl/locale/src/unix/moz.build
+++ b/intl/locale/src/unix/moz.build
@@ -14,11 +14,9 @@ if CONFIG['OS_TARGET'] == 'Android':
     SOURCES += [
         'nsAndroidCharset.cpp',
     ]
 else:
     SOURCES += [
         'nsUNIXCharset.cpp',
     ]
 
-LIBRARY_NAME = 'platlocale_s'
-
 FINAL_LIBRARY = 'i18n'
--- a/intl/locale/src/windows/moz.build
+++ b/intl/locale/src/windows/moz.build
@@ -6,11 +6,9 @@
 
 SOURCES += [
     'nsCollationWin.cpp',
     'nsDateTimeFormatWin.cpp',
     'nsWin32Locale.cpp',
     'nsWinCharset.cpp',
 ]
 
-LIBRARY_NAME = 'platlocale_s'
-
 FINAL_LIBRARY = 'i18n'
--- a/intl/lwbrk/src/moz.build
+++ b/intl/lwbrk/src/moz.build
@@ -26,13 +26,12 @@ else:
     SOURCES += [
         'nsRuleBreaker.cpp',
     ]
     SOURCES += [
         'rulebrk.c',
     ]
 
 
-LIBRARY_NAME = 'lwbrk_s'
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'i18n'
--- a/intl/strres/src/moz.build
+++ b/intl/strres/src/moz.build
@@ -4,13 +4,11 @@
 # 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/.
 
 SOURCES += [
     'nsStringBundle.cpp',
     'nsStringBundleTextOverride.cpp',
 ]
 
-LIBRARY_NAME = 'strres_s'
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'i18n'
--- a/intl/uconv/src/moz.build
+++ b/intl/uconv/src/moz.build
@@ -213,17 +213,15 @@ if CONFIG['OS_ARCH'] == 'OS2':
         '../ucvibm/nsUnicodeToCP869.cpp',
     ]
 
 if CONFIG['INTEL_ARCHITECTURE']:
     SOURCES += [
         'nsUTF8ToUnicodeSSE2.cpp',
     ]
 
-LIBRARY_NAME = 'uconv'
-
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../util',
 ]
 
 FINAL_LIBRARY = 'xul'
--- a/intl/unicharutil/src/moz.build
+++ b/intl/unicharutil/src/moz.build
@@ -7,11 +7,9 @@
 UNIFIED_SOURCES += [
     'nsCaseConversionImp2.cpp',
     'nsCategoryImp.cpp',
     'nsEntityConverter.cpp',
     'nsSaveAsCharset.cpp',
     'nsUnicodeNormalizer.cpp',
 ]
 
-LIBRARY_NAME = 'ucharucomp_s'
-
 FINAL_LIBRARY = 'i18n'
--- a/intl/unicharutil/util/internal/moz.build
+++ b/intl/unicharutil/util/internal/moz.build
@@ -3,11 +3,9 @@
 # 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/.
 
 include('../objs.mozbuild')
 
 UNIFIED_SOURCES += intl_unicharutil_util_cppsrcs
 
-LIBRARY_NAME = 'unicharutil_s'
-
 FINAL_LIBRARY = 'xul'
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@@ -272,13 +272,11 @@ if CONFIG['_MSC_VER']:
     ]
 
 ost = CONFIG['OS_TEST']
 if ost.find('86') == -1 and ost.find('arm') == -1 and ost.find('mips') == -1:
     SOURCES += [
         'src/base/atomicops_internals_mutex.cc',
     ]
 
-LIBRARY_NAME = 'chromium_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/ipc/dbus/moz.build
+++ b/ipc/dbus/moz.build
@@ -11,13 +11,11 @@ EXPORTS.mozilla.ipc += [
 ]
 
 SOURCES += [
     'DBusThread.cpp',
     'DBusUtils.cpp',
     'RawDBusConnection.cpp',
 ]
 
-LIBRARY_NAME = 'mozdbus_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/ipc/glue/moz.build
+++ b/ipc/glue/moz.build
@@ -93,13 +93,11 @@ SOURCES += [
 ]
 
 IPDL_SOURCES = [
     'InputStreamParams.ipdlh',
     'ProtocolTypes.ipdlh',
     'URIParams.ipdlh',
 ]
 
-LIBRARY_NAME = 'mozipc_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/ipc/ipdl/moz.build
+++ b/ipc/ipdl/moz.build
@@ -4,13 +4,11 @@
 # 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/.
 
 if CONFIG['MOZ_IPDL_TESTS']:
     DIRS += ['test']
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'mozipdlgen_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/ipc/ipdl/test/cxx/moz.build
+++ b/ipc/ipdl/test/cxx/moz.build
@@ -1,16 +1,15 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 TOOL_DIRS += ['app']
-LIBRARY_NAME = 'ipdlunittest_s'
 
 EXPORTS.mozilla._ipdltest += [
     'IPDLUnitTestProcessChild.h',
     'IPDLUnitTests.h',
     'IPDLUnitTestTypes.h',
     'IPDLUnitTestUtils.h',
 ]
 
--- a/ipc/keystore/moz.build
+++ b/ipc/keystore/moz.build
@@ -9,13 +9,11 @@ EXPORTS.mozilla.ipc += [
 ]
 
 SOURCES += [
   'KeyStore.cpp'
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'mozkeystore_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/ipc/netd/moz.build
+++ b/ipc/netd/moz.build
@@ -7,13 +7,11 @@
 EXPORTS.mozilla.ipc += [
     'Netd.h',
 ]
 
 SOURCES += [
     'Netd.cpp',
 ]
 
-LIBRARY_NAME = 'moznetd_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/ipc/nfc/moz.build
+++ b/ipc/nfc/moz.build
@@ -6,15 +6,13 @@
 if CONFIG['MOZ_NFC']:
     EXPORTS.mozilla.ipc += [
         'Nfc.h',
     ]
     SOURCES += [
         'Nfc.cpp',
     ]
 
-LIBRARY_NAME = 'moznfc_s'
-
 EXPORT_LIBRARY = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/ipc/ril/moz.build
+++ b/ipc/ril/moz.build
@@ -7,13 +7,11 @@
 EXPORTS.mozilla.ipc += [
     'Ril.h',
 ]
 
 SOURCES += [
     'Ril.cpp',
 ]
 
-LIBRARY_NAME = 'mozril_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/ipc/testshell/moz.build
+++ b/ipc/testshell/moz.build
@@ -22,13 +22,11 @@ SOURCES += [
 
 IPDL_SOURCES = [
     'PTestShell.ipdl',
     'PTestShellCommand.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'ipcshell_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/ipc/unixsocket/moz.build
+++ b/ipc/unixsocket/moz.build
@@ -9,13 +9,11 @@ EXPORTS.mozilla.ipc += [
 ]
 
 SOURCES += [
     'UnixSocket.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'mozipcunixsocket_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/js/ductwork/debugger/moz.build
+++ b/js/ductwork/debugger/moz.build
@@ -11,15 +11,13 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'jsdebugger'
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
 
 SOURCES += [
     'JSDebugger.cpp',
 ]
 
-LIBRARY_NAME = 'jsdebugger'
-
 EXTRA_JS_MODULES += [
     'jsdebugger.jsm',
 ]
 
 FINAL_LIBRARY = 'xul'
--- a/js/ipc/moz.build
+++ b/js/ipc/moz.build
@@ -12,13 +12,11 @@ SOURCES += [
 
 IPDL_SOURCES += [
     'JavaScriptTypes.ipdlh',
     'PJavaScript.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'jsipc_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/js/jsd/moz.build
+++ b/js/jsd/moz.build
@@ -29,11 +29,9 @@ SOURCES += [
     'jshash.cpp',
 ]
 
 DEFINES['EXPORT_JSD_API'] = True
 
 if CONFIG['JS_THREADSAFE']:
     DEFINES['JS_THREADSAFE'] = True
 
-LIBRARY_NAME = 'jsd'
-
 FINAL_LIBRARY = 'xul'
--- a/js/xpconnect/loader/moz.build
+++ b/js/xpconnect/loader/moz.build
@@ -5,18 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 UNIFIED_SOURCES += [
     'mozJSComponentLoader.cpp',
     'mozJSLoaderUtils.cpp',
     'mozJSSubScriptLoader.cpp',
 ]
 
-LIBRARY_NAME = 'jsloader_s'
-
 EXTRA_JS_MODULES += [
     'ISO8601DateUtils.jsm',
     'XPCOMUtils.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
--- a/js/xpconnect/wrappers/moz.build
+++ b/js/xpconnect/wrappers/moz.build
@@ -16,16 +16,14 @@ UNIFIED_SOURCES += [
     'WrapperFactory.cpp',
 ]
 
 # XrayWrapper needs to be built separately because of template instantiations.
 SOURCES += [
     'XrayWrapper.cpp',
 ]
 
-LIBRARY_NAME = 'xpcwrappers_s'
-
 # warning C4661 for FilteringWrapper
 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xpconnect_s'
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -104,13 +104,11 @@ SOURCES += [
     'nsPresArena.cpp',
     'nsRefreshDriver.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'gkbase_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@@ -30,15 +30,13 @@ UNIFIED_SOURCES += [
     'nsListControlFrame.cpp',
     'nsMeterFrame.cpp',
     'nsProgressFrame.cpp',
     'nsRangeFrame.cpp',
     'nsSelectsAreaFrame.cpp',
     'nsTextControlFrame.cpp',
 ]
 
-LIBRARY_NAME = 'gkforms_s'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -98,13 +98,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
     UNIFIED_SOURCES += [
         'nsPluginUtilsOSX.mm',
     ]
 
 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'gkgeneric_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/layout/inspector/src/moz.build
+++ b/layout/inspector/src/moz.build
@@ -20,13 +20,11 @@ UNIFIED_SOURCES += [
     'nsFontFaceList.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
     UNIFIED_SOURCES += [
         'inDOMView.cpp',
     ]
 
-LIBRARY_NAME = 'inspector_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
--- a/layout/ipc/moz.build
+++ b/layout/ipc/moz.build
@@ -16,13 +16,11 @@ UNIFIED_SOURCES += [
 ]
 
 IPDL_SOURCES = [
     'PRenderFrame.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'gkipc_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/layout/mathml/moz.build
+++ b/layout/mathml/moz.build
@@ -26,11 +26,9 @@ UNIFIED_SOURCES += [
     'nsMathMLOperators.cpp',
     'nsMathMLSelectedFrame.cpp',
     'nsMathMLsemanticsFrame.cpp',
     'nsMathMLTokenFrame.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'gkmathml_s'
-
 FINAL_LIBRARY = 'gklayout'
--- a/layout/printing/moz.build
+++ b/layout/printing/moz.build
@@ -15,13 +15,11 @@ XPIDL_MODULE = 'layout_printing'
 UNIFIED_SOURCES += [
     'nsPagePrintTimer.cpp',
     'nsPrintData.cpp',
     'nsPrintEngine.cpp',
     'nsPrintObject.cpp',
     'nsPrintPreviewListener.cpp',
 ]
 
-LIBRARY_NAME = 'gkprinting_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -124,13 +124,11 @@ UNIFIED_SOURCES += [
 SOURCES += [
     'nsCSSRuleProcessor.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'gkstyle_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
--- a/layout/svg/moz.build
+++ b/layout/svg/moz.build
@@ -43,11 +43,9 @@ UNIFIED_SOURCES += [
     'SVGFEImageFrame.cpp',
     'SVGFELeafFrame.cpp',
     'SVGFEUnstyledLeafFrame.cpp',
     'SVGViewFrame.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'gksvgbase_s'
-
 FINAL_LIBRARY = 'gklayout'
--- a/layout/tables/moz.build
+++ b/layout/tables/moz.build
@@ -20,15 +20,13 @@ UNIFIED_SOURCES += [
     'nsTableFrame.cpp',
     'nsTableOuterFrame.cpp',
     'nsTablePainter.cpp',
     'nsTableRowFrame.cpp',
     'nsTableRowGroupFrame.cpp',
     'SpanningCellSorter.cpp',
 ]
 
-LIBRARY_NAME = 'gktable_s'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'
--- a/layout/tools/layout-debug/src/moz.build
+++ b/layout/tools/layout-debug/src/moz.build
@@ -17,13 +17,11 @@ EXPORTS += [
 
 UNIFIED_SOURCES += [
     'nsDebugFactory.cpp',
     'nsLayoutDebugCLH.cpp',
     'nsLayoutDebuggingTools.cpp',
     'nsRegressionTester.cpp',
 ]
 
-LIBRARY_NAME = 'gkdebug'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
--- a/layout/xul/base/src/moz.build
+++ b/layout/xul/base/src/moz.build
@@ -51,11 +51,9 @@ if CONFIG['MOZ_XUL']:
         'nsXULLabelFrame.cpp',
         'nsXULPopupManager.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'gkxulbase_s'
-
 FINAL_LIBRARY = 'gklayout'
--- a/layout/xul/grid/moz.build
+++ b/layout/xul/grid/moz.build
@@ -23,13 +23,11 @@ UNIFIED_SOURCES += [
     'nsGridRow.cpp',
     'nsGridRowGroupFrame.cpp',
     'nsGridRowGroupLayout.cpp',
     'nsGridRowLayout.cpp',
     'nsGridRowLeafFrame.cpp',
     'nsGridRowLeafLayout.cpp',
 ]
 
-LIBRARY_NAME = 'gkxulgrid_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -26,13 +26,11 @@ UNIFIED_SOURCES += [
     'nsTreeColumns.cpp',
     'nsTreeContentView.cpp',
     'nsTreeImageListener.cpp',
     'nsTreeSelection.cpp',
     'nsTreeStyleCache.cpp',
     'nsTreeUtils.cpp',
 ]
 
-LIBRARY_NAME = 'gkxultree_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'gklayout'
--- a/media/kiss_fft/moz.build
+++ b/media/kiss_fft/moz.build
@@ -9,14 +9,12 @@ EXPORTS.kiss_fft += [
     'kiss_fftr.h',
 ]
 
 SOURCES += [
     'kiss_fft.c',
     'kiss_fftr.c',
 ]
 
-LIBRARY_NAME = 'kiss_fft'
-
 if CONFIG['OS_TARGET'] == 'WINNT':
     NO_VISIBILITY_FLAGS = True
 
 FINAL_LIBRARY = 'xul'
--- a/media/libcubeb/src/moz.build
+++ b/media/libcubeb/src/moz.build
@@ -40,16 +40,14 @@ if CONFIG['OS_TARGET'] == 'Android':
     SOURCES += [
         'cubeb_opensl.c',
     ]
     if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
         SOURCES += [
             'cubeb_audiotrack.c',
         ]
 
-LIBRARY_NAME = 'cubeb'
-
 MSVC_ENABLE_PGO = True
 
 if CONFIG['OS_TARGET'] == 'WINNT':
     NO_VISIBILITY_FLAGS = True
 
 FINAL_LIBRARY = 'gkmedias'
--- a/media/libjpeg/moz.build
+++ b/media/libjpeg/moz.build
@@ -139,16 +139,14 @@ elif CONFIG['LIBJPEG_TURBO_X86_ASM']:
     SOURCES += [
         'simd/jsimd_i386.c',
     ]
 else: # No SIMD support?
     SOURCES += [
         'jsimd_none.c',
     ]
 
-LIBRARY_NAME = 'mozjpeg'
-
 MSVC_ENABLE_PGO = True
 
 if CONFIG['OS_TARGET'] == 'WINNT':
     NO_VISIBILITY_FLAGS = True
 
 FINAL_LIBRARY = 'gkmedias'
--- a/media/libnestegg/src/moz.build
+++ b/media/libnestegg/src/moz.build
@@ -4,16 +4,14 @@
 # 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/.
 
 UNIFIED_SOURCES += [
     'halloc.c',
     'nestegg.c',
 ]
 
-LIBRARY_NAME = 'nestegg'
-
 MSVC_ENABLE_PGO = True
 
 if CONFIG['OS_TARGET'] == 'WINNT':
     NO_VISIBILITY_FLAGS = True
 
 FINAL_LIBRARY = 'gkmedias'
--- a/media/libogg/moz.build
+++ b/media/libogg/moz.build
@@ -5,18 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXPORTS.ogg += [
     'include/ogg/config_types.h',
     'include/ogg/ogg.h',
     'include/ogg/os_types.h',
 ]
 
-LIBRARY_NAME = 'ogg'
-
 UNIFIED_SOURCES += [
     'src/ogg_bitwise.c',
     'src/ogg_framing.c',
 ]
 
 MSVC_ENABLE_PGO = True
 
 if CONFIG['OS_TARGET'] == 'WINNT':
--- a/media/libopus/moz.build
+++ b/media/libopus/moz.build
@@ -6,13 +6,11 @@
 
 EXPORTS.opus += [
     'include/opus.h',
     'include/opus_defines.h',
     'include/opus_multistream.h',
     'include/opus_types.h',
 ]
 
-LIBRARY_NAME = 'opus'
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gkmedias'
--- a/media/libsoundtouch/src/moz.build
+++ b/media/libsoundtouch/src/moz.build
@@ -26,14 +26,12 @@ if CONFIG['INTEL_ARCHITECTURE']:
         UNIFIED_SOURCES += [
             'sse_optimized.cpp',
         ]
     else:
         UNIFIED_SOURCES += [
             'mmx_optimized.cpp',
         ]
 
-LIBRARY_NAME = 'soundtouch'
-
 MSVC_ENABLE_PGO = True
 NO_VISIBILITY_FLAGS = True
 
 FINAL_LIBRARY = 'gkmedias'
--- a/media/libspeex_resampler/src/moz.build
+++ b/media/libspeex_resampler/src/moz.build
@@ -9,17 +9,15 @@ EXPORTS.speex += [
     'speex_resampler.h',
     'speex_types.h',
 ]
 
 SOURCES += [
   'sse_detect.cpp',
 ]
 
-LIBRARY_NAME = 'speex_resampler'
-
 SOURCES += [
     'resample.c',
 ]
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gkmedias'
--- a/media/libtheora/lib/moz.build
+++ b/media/libtheora/lib/moz.build
@@ -1,16 +1,14 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
-LIBRARY_NAME = 'theora'
-
 UNIFIED_SOURCES += [
     'apiwrapper.c',
     'bitpack.c',
     'decapiwrapper.c',
     'decinfo.c',
     'decode.c',
     'dequant.c',
     'fragment.c',
--- a/media/libtremor/lib/moz.build
+++ b/media/libtremor/lib/moz.build
@@ -1,16 +1,14 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
-LIBRARY_NAME = 'tremor'
-
 SOURCES += [
     'tremor_block.c',
     'tremor_codebook.c',
     'tremor_floor0.c',
     'tremor_floor1.c',
     'tremor_info.c',
     'tremor_mapping0.c',
     'tremor_mdct.c',
--- a/media/libvorbis/moz.build
+++ b/media/libvorbis/moz.build
@@ -4,18 +4,16 @@
 # 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/.
 
 EXPORTS.vorbis += [
     'include/vorbis/codec.h',
     'include/vorbis/vorbisenc.h',
 ]
 
-LIBRARY_NAME = 'vorbis'
-
 SOURCES += [
     'lib/vorbis_analysis.c',
     'lib/vorbis_bitrate.c',
     'lib/vorbis_block.c',
     'lib/vorbis_codebook.c',
     'lib/vorbis_envelope.c',
     'lib/vorbis_floor0.c',
     'lib/vorbis_floor1.c',
--- a/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -31,18 +31,16 @@ EXPORTS.vpx += [
 
 if CONFIG['VPX_NEED_OBJ_INT_EXTRACT']:
     HOST_SOURCES += [
         'build/make/obj_int_extract.c',
     ]
 
     HOST_PROGRAM = 'host_obj_int_extract'
 
-LIBRARY_NAME = 'vpx'
-
 SOURCES += [
     'vp8/common/alloccommon.c',
     'vp8/common/blockd.c',
     'vp8/common/debugmodes.c',
     'vp8/common/dequantize.c',
     'vp8/common/entropy.c',
     'vp8/common/entropymode.c',
     'vp8/common/entropymv.c',
--- a/modules/libjar/zipwriter/src/moz.build
+++ b/modules/libjar/zipwriter/src/moz.build
@@ -8,13 +8,11 @@ UNIFIED_SOURCES += [
     'nsDeflateConverter.cpp',
     'nsZipDataStream.cpp',
     'nsZipHeader.cpp',
     'nsZipWriter.cpp',
     'StreamFunctions.cpp',
     'ZipWriterModule.cpp',
 ]
 
-LIBRARY_NAME = 'zipwriter'
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
--- a/modules/libpref/src/moz.build
+++ b/modules/libpref/src/moz.build
@@ -9,13 +9,11 @@ SOURCES += [
     'nsPrefsFactory.cpp',
     'prefapi.cpp',
     'Preferences.cpp',
     'prefread.cpp',
 ]
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'pref'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/mozglue/android/moz.build
+++ b/mozglue/android/moz.build
@@ -10,13 +10,11 @@ EXPORTS += [
 
 SOURCES += [
     'APKOpen.cpp',
     'nsGeckoUtils.cpp',
     'NSSBridge.cpp',
     'SQLiteBridge.cpp',
 ]
 
-LIBRARY_NAME = 'android'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'mozglue'
--- a/netwerk/base/src/moz.build
+++ b/netwerk/base/src/moz.build
@@ -103,18 +103,16 @@ if CONFIG['MOZ_ENABLE_QTNETWORK']:
 EXTRA_JS_MODULES += [
     'NetUtil.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'neckobase_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
 LOCAL_INCLUDES += [
     '/dom/base',
 ]
 
 if 'rtsp' in CONFIG['NECKO_PROTOCOLS']:
--- a/netwerk/cache/moz.build
+++ b/netwerk/cache/moz.build
@@ -35,15 +35,13 @@ SOURCES += [
     'nsDiskCacheDevice.cpp',
     'nsDiskCacheDeviceSQL.cpp',
     'nsDiskCacheEntry.cpp',
     'nsDiskCacheMap.cpp',
     'nsDiskCacheStreams.cpp',
     'nsMemoryCacheDevice.cpp',
 ]
 
-LIBRARY_NAME = 'nkcache_s'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/cache2/moz.build
+++ b/netwerk/cache2/moz.build
@@ -38,15 +38,13 @@ SOURCES += [
     'CacheStorageService.cpp',
     'OldWrappers.cpp',
 ]
 
 LOCAL_INCLUDES += [
     '../base/src',
 ]
 
-LIBRARY_NAME = 'nkcache2_s'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/cookie/moz.build
+++ b/netwerk/cookie/moz.build
@@ -14,18 +14,16 @@ XPIDL_SOURCES += [
     'nsICookieService.idl',
 ]
 
 XPIDL_MODULE = 'necko_cookie'
 
 if CONFIG['NECKO_COOKIES']:
     MSVC_ENABLE_PGO = True
 
-    LIBRARY_NAME = 'neckocookie_s'
-
     EXPORTS.mozilla.net = [
         'CookieServiceChild.h',
         'CookieServiceParent.h',
     ]
     SOURCES += [
         'CookieServiceChild.cpp',
         'CookieServiceParent.cpp',
         'nsCookie.cpp',
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@@ -28,15 +28,13 @@ SOURCES += [
 SOURCES += [
     'DNS.cpp',
     'nsDNSService2.cpp',
     'nsEffectiveTLDService.cpp',
     'nsHostResolver.cpp',
     'nsIDNService.cpp',
 ]
 
-LIBRARY_NAME = 'neckodns_s'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/ipc/moz.build
+++ b/netwerk/ipc/moz.build
@@ -33,13 +33,11 @@ IPDL_SOURCES = [
     'NeckoChannelParams.ipdlh',
     'PNecko.ipdl',
     'PRemoteOpenFile.ipdl',
     'PRtspController.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'neckoipc_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/mime/moz.build
+++ b/netwerk/mime/moz.build
@@ -15,15 +15,13 @@ XPIDL_MODULE = 'mimetype'
 EXPORTS += [
     'nsMimeTypes.h',
 ]
 
 SOURCES += [
     'nsMIMEHeaderParamImpl.cpp',
 ]
 
-LIBRARY_NAME = 'nkmime_s'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/protocol/about/moz.build
+++ b/netwerk/protocol/about/moz.build
@@ -19,13 +19,11 @@ SOURCES += [
     'nsAboutBloat.cpp',
     'nsAboutCache.cpp',
     'nsAboutCacheEntry.cpp',
     'nsAboutProtocolHandler.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'nkabout_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/protocol/app/moz.build
+++ b/netwerk/protocol/app/moz.build
@@ -3,13 +3,11 @@
 # 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/.
 
 SOURCES += [
     'AppProtocolHandler.cpp',
 ]
 
-LIBRARY_NAME = 'nkapp_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/protocol/data/moz.build
+++ b/netwerk/protocol/data/moz.build
@@ -4,13 +4,11 @@
 # 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/.
 
 UNIFIED_SOURCES += [
     'nsDataChannel.cpp',
     'nsDataHandler.cpp',
 ]
 
-LIBRARY_NAME = 'nkdata_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/protocol/device/moz.build
+++ b/netwerk/protocol/device/moz.build
@@ -15,13 +15,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
 
 UNIFIED_SOURCES += [
     'nsDeviceChannel.cpp',
     'nsDeviceProtocolHandler.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'nkdevice_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/protocol/file/moz.build
+++ b/netwerk/protocol/file/moz.build
@@ -11,15 +11,13 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_file'
 
 UNIFIED_SOURCES += [
     'nsFileChannel.cpp',
     'nsFileProtocolHandler.cpp',
 ]
 
-LIBRARY_NAME = 'nkfile_s'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/protocol/ftp/moz.build
+++ b/netwerk/protocol/ftp/moz.build
@@ -31,13 +31,11 @@ SOURCES += [
 IPDL_SOURCES += [
     'PFTPChannel.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'nkftp_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -90,13 +90,11 @@ EXTRA_COMPONENTS += [
     'HttpDataUsage.js',
     'HttpDataUsage.manifest',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'nkhttp_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/protocol/res/moz.build
+++ b/netwerk/protocol/res/moz.build
@@ -13,13 +13,11 @@ XPIDL_MODULE = 'necko_res'
 SOURCES += [
     'nsResProtocolHandler.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'nkres_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/protocol/rtsp/moz.build
+++ b/netwerk/protocol/rtsp/moz.build
@@ -37,13 +37,11 @@ SOURCES += [
     'RtspChannel.cpp',
     'RtspHandler.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'nkrtsp_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/protocol/viewsource/moz.build
+++ b/netwerk/protocol/viewsource/moz.build
@@ -10,13 +10,11 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_viewsource'
 
 UNIFIED_SOURCES += [
     'nsViewSourceChannel.cpp',
     'nsViewSourceHandler.cpp',
 ]
 
-LIBRARY_NAME = 'nkviewsource_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/protocol/websocket/moz.build
+++ b/netwerk/protocol/websocket/moz.build
@@ -28,13 +28,11 @@ UNIFIED_SOURCES += [
 IPDL_SOURCES += [
     'PWebSocket.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'nkwebsocket_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@@ -24,13 +24,11 @@ UNIFIED_SOURCES += [
 ]
 
 IPDL_SOURCES += [
     'PWyciwygChannel.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'nkwyciwyg_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/sctp/datachannel/moz.build
+++ b/netwerk/sctp/datachannel/moz.build
@@ -13,13 +13,11 @@ EXPORTS.mozilla.net += [
 ]
 
 SOURCES += [
     'DataChannel.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'nkdatachan_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/socket/moz.build
+++ b/netwerk/socket/moz.build
@@ -16,13 +16,11 @@ XPIDL_MODULE = 'necko_socket'
 
 UNIFIED_SOURCES += [
     'nsSocketProviderService.cpp',
     'nsSOCKSIOLayer.cpp',
     'nsSOCKSSocketProvider.cpp',
     'nsUDPSocketProvider.cpp',
 ]
 
-LIBRARY_NAME = 'neckosocket_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/streamconv/converters/moz.build
+++ b/netwerk/streamconv/converters/moz.build
@@ -21,15 +21,13 @@ if 'ftp' in CONFIG['NECKO_PROTOCOLS']:
         'ParseFTPList.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'cocoa':
     SOURCES += [
         'nsBinHexDecoder.cpp',
     ]
 
-LIBRARY_NAME = 'nkcnvts_s'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/streamconv/src/moz.build
+++ b/netwerk/streamconv/src/moz.build
@@ -5,13 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 FAIL_ON_WARNINGS = True
 
 SOURCES += [
     'nsStreamConverterService.cpp',
 ]
 
-LIBRARY_NAME = 'nkconv_s'
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/system/android/moz.build
+++ b/netwerk/system/android/moz.build
@@ -3,13 +3,11 @@
 # 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/.
 
 SOURCES += [
     'nsAndroidNetworkLinkService.cpp',
 ]
 
-LIBRARY_NAME = 'neckosystem_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/system/mac/moz.build
+++ b/netwerk/system/mac/moz.build
@@ -1,15 +1,13 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
-LIBRARY_NAME = 'neckosystem_s'
-
 SOURCES += [
     'nsNetworkLinkService.mm',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/system/qt/moz.build
+++ b/netwerk/system/qt/moz.build
@@ -8,13 +8,11 @@ SOURCES += [
     'nsQtNetworkLinkService.cpp',
     'nsQtNetworkManager.cpp',
 ]
 
 GENERATED_SOURCES += [
     'moc_nsQtNetworkManager.cpp',
 ]
 
-LIBRARY_NAME = 'neckosystem_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/system/win32/moz.build
+++ b/netwerk/system/win32/moz.build
@@ -4,13 +4,11 @@
 # 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/.
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
         'nsNotifyAddrListener.cpp',
     ]
 
-LIBRARY_NAME = 'neckosystem_s'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'necko'
--- a/netwerk/wifi/moz.build
+++ b/netwerk/wifi/moz.build
@@ -45,11 +45,9 @@ elif CONFIG['OS_ARCH'] == 'SunOS':
         'nsWifiScannerSolaris.cpp',
     ]
 
 if CONFIG['NECKO_WIFI_DBUS']:
     UNIFIED_SOURCES += [
         'nsWifiScannerDBus.cpp',
     ]
 
-LIBRARY_NAME = 'neckowifi_s'
-
 FINAL_LIBRARY = 'necko'
--- a/other-licenses/android/moz.build
+++ b/other-licenses/android/moz.build
@@ -1,16 +1,14 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
-LIBRARY_NAME = 'android'
-
 SOURCES += [
     'ev_streams.c',
     'ev_timers.c',
     'getaddrinfo.c',
     'ns_name.c',
     'ns_netint.c',
     'ns_parse.c',
     'ns_print.c',
--- a/other-licenses/skia-npapi/moz.build
+++ b/other-licenses/skia-npapi/moz.build
@@ -11,11 +11,9 @@ EXPORTS += [
 SOURCES += [
     'ANPCanvas.cpp',
     'ANPPaint.cpp',
     'ANPPath.cpp',
     'ANPTypeface.cpp',
     'SkANP.cpp',
 ]
 
-LIBRARY_NAME = 'skia_npapi'
-
 FINAL_LIBRARY = 'xul'
--- a/other-licenses/snappy/moz.build
+++ b/other-licenses/snappy/moz.build
@@ -12,11 +12,9 @@ EXPORTS.snappy += [
 
 SOURCES += [
     'src/snappy-c.cc',
     'src/snappy-sinksource.cc',
     'src/snappy-stubs-internal.cc',
     'src/snappy.cc',
 ]
 
-LIBRARY_NAME = 'snappy_s'
-
 FINAL_LIBRARY = 'xul'
--- a/parser/expat/lib/moz.build
+++ b/parser/expat/lib/moz.build
@@ -4,18 +4,16 @@
 # 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/.
 
 EXPORTS += [
     'expat.h',
     'expat_external.h',
 ]
 
-LIBRARY_NAME = 'mozexpat_s'
-
 SOURCES += [
     'xmlparse.c',
     'xmlrole.c',
     'xmltok.c',
 ]
 
 MSVC_ENABLE_PGO = True
 
--- a/parser/html/moz.build
+++ b/parser/html/moz.build
@@ -78,13 +78,11 @@ UNIFIED_SOURCES += [
     'nsHtml5TreeOperation.cpp',
     'nsHtml5TreeOpExecutor.cpp',
     'nsHtml5TreeOpStage.cpp',
     'nsHtml5UTF16Buffer.cpp',
     'nsHtml5ViewSourceUtils.cpp',
     'nsParserUtils.cpp',
 ]
 
-LIBRARY_NAME = 'html5p_s'
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'
--- a/parser/xml/src/moz.build
+++ b/parser/xml/src/moz.build
@@ -11,13 +11,11 @@ EXPORTS += [
 ]
 
 SOURCES += [
     'nsSAXAttributes.cpp',
     'nsSAXLocator.cpp',
     'nsSAXXMLReader.cpp',
 ]
 
-LIBRARY_NAME = 'saxp'
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'htmlpars'
--- a/rdf/base/src/moz.build
+++ b/rdf/base/src/moz.build
@@ -16,11 +16,9 @@ SOURCES += [
     'nsRDFService.cpp',
     'nsRDFXMLDataSource.cpp',
     'nsRDFXMLParser.cpp',
     'nsRDFXMLSerializer.cpp',
     'rdfTriplesSerializer.cpp',
     'rdfutil.cpp',
 ]
 
-LIBRARY_NAME = 'rdfbase_s'
-
 FINAL_LIBRARY = 'rdf'
--- a/rdf/datasource/src/moz.build
+++ b/rdf/datasource/src/moz.build
@@ -4,11 +4,9 @@
 # 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/.
 
 SOURCES += [
     'nsFileSystemDataSource.cpp',
     'nsLocalStore.cpp',
 ]
 
-LIBRARY_NAME = 'rdfdatasource_s'
-
 FINAL_LIBRARY = 'rdf'
--- a/rdf/util/src/internal/moz.build
+++ b/rdf/util/src/internal/moz.build
@@ -3,11 +3,9 @@
 # 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/.
 
 include('../objs.mozbuild')
 
 SOURCES += rdf_util_src_cppsrcs
 
-LIBRARY_NAME = 'rdfutil_s'
-
 FINAL_LIBRARY = 'xul'
--- a/security/manager/boot/src/moz.build
+++ b/security/manager/boot/src/moz.build
@@ -8,15 +8,13 @@ SOURCES += [
     'nsBOOTModule.cpp',
     'nsEntropyCollector.cpp',
     'nsSecureBrowserUIImpl.cpp',
     'nsSecurityHeaderParser.cpp',
     'nsSecurityWarningDialogs.cpp',
     'nsSiteSecurityService.cpp',
 ]
 
-LIBRARY_NAME = 'pipboot'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
--- a/security/manager/pki/src/moz.build
+++ b/security/manager/pki/src/moz.build
@@ -8,13 +8,11 @@ SOURCES += [
     'nsASN1Tree.cpp',
     'nsFormSigningDialog.cpp',
     'nsNSSDialogHelper.cpp',
     'nsNSSDialogs.cpp',
     'nsPKIModule.cpp',
     'nsPKIParamBlock.cpp',
 ]
 
-LIBRARY_NAME = 'pippki'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
--- a/security/manager/ssl/src/moz.build
+++ b/security/manager/ssl/src/moz.build
@@ -76,15 +76,13 @@ if not CONFIG['MOZ_DISABLE_CRYPTOLEGACY'
         'nsSmartCardMonitor.cpp',
     ]
 
 if CONFIG['MOZ_XUL']:
     SOURCES += [
         'nsCertTree.cpp',
     ]
 
-LIBRARY_NAME = 'pipnss'
-
 SOURCES += [
     'md4.c',
 ]
 
 FINAL_LIBRARY = 'xul'
--- a/security/sandbox/linux/moz.build
+++ b/security/sandbox/linux/moz.build
@@ -9,13 +9,11 @@ FAIL_ON_WARNINGS = True
 EXPORTS.mozilla += [
     'Sandbox.h',
 ]
 
 SOURCES += [
     'Sandbox.cpp',
 ]
 
-LIBRARY_NAME = 'sandbox_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/services/crypto/component/moz.build
+++ b/services/crypto/component/moz.build
@@ -11,13 +11,11 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'services-crypto-component'
 
 SOURCES += [
     'nsSyncJPAKE.cpp',
 ]
 
-LIBRARY_NAME = 'services-crypto'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
--- a/startupcache/moz.build
+++ b/startupcache/moz.build
@@ -19,11 +19,9 @@ EXPORTS.mozilla.scache += [
 ]
 
 SOURCES += [
     'StartupCache.cpp',
     'StartupCacheModule.cpp',
     'StartupCacheUtils.cpp',
 ]
 
-LIBRARY_NAME = 'startupcache'
-
 FINAL_LIBRARY = 'xul'
--- a/storage/src/moz.build
+++ b/storage/src/moz.build
@@ -34,11 +34,9 @@ UNIFIED_SOURCES += [
 ]
 
 # These files need to be built separately because they #include variantToSQLiteT_impl.h.
 SOURCES += [
     'mozStorageBindingParams.cpp',
     'mozStorageConnection.cpp',
 ]
 
-LIBRARY_NAME = 'storage_s'
-
 FINAL_LIBRARY = 'storagecomps'
--- a/toolkit/components/alerts/moz.build
+++ b/toolkit/components/alerts/moz.build
@@ -12,13 +12,11 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'alerts'
 
 SOURCES += [
     'nsAlertsService.cpp',
     'nsXULAlerts.cpp',
 ]
 
-LIBRARY_NAME = 'alerts_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'toolkitcomps'
--- a/toolkit/components/autocomplete/moz.build
+++ b/toolkit/components/autocomplete/moz.build
@@ -17,13 +17,11 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'autocomplete'
 
 SOURCES += [
     'nsAutoCompleteController.cpp',
     'nsAutoCompleteSimpleResult.cpp',
 ]
 
-LIBRARY_NAME = 'tkautocomplete'
-
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
--- a/toolkit/components/commandlines/moz.build
+++ b/toolkit/components/commandlines/moz.build
@@ -14,11 +14,9 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'commandlines'
 
 SOURCES += [
     'nsCommandLine.cpp',
 ]
 
-LIBRARY_NAME = 'commandlines'
-
 FINAL_LIBRARY = 'xul'
--- a/toolkit/components/ctypes/moz.build
+++ b/toolkit/components/ctypes/moz.build
@@ -9,15 +9,13 @@ TEST_DIRS += ['tests']
 SOURCES += [
     'ctypes.cpp',
 ]
 
 LOCAL_INCLUDES += [
     '/js/xpconnect/loader',
 ]
 
-LIBRARY_NAME = 'jsctypes'
-
 EXTRA_JS_MODULES += [
     'ctypes.jsm',
 ]
 
 FINAL_LIBRARY = 'xul'
--- a/toolkit/components/diskspacewatcher/moz.build
+++ b/toolkit/components/diskspacewatcher/moz.build
@@ -14,13 +14,11 @@ EXPORTS += [
 
 XPIDL_MODULE = 'diskspacewatcher'
 XPIDL_MODULE = 'toolkitcomps'
 
 SOURCES = [
     'DiskSpaceWatcher.cpp',
 ]
 
-LIBRARY_NAME = 'diskspacewatcher'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/toolkit/components/downloads/moz.build
+++ b/toolkit/components/downloads/moz.build
@@ -37,11 +37,9 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 if not CONFIG['MOZ_SUITE']:
     EXTRA_COMPONENTS += [
         'nsDownloadManagerUI.js',
         'nsDownloadManagerUI.manifest',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'download_s'
-
 FINAL_LIBRARY = 'toolkitcomps'
--- a/toolkit/components/filepicker/moz.build
+++ b/toolkit/components/filepicker/moz.build
@@ -2,17 +2,16 @@
 # vim: set filetype=python:
 # 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/.
 
 if CONFIG['MOZ_XUL'] and \
     CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('android', 'qt', 'os2', 'cocoa', 'windows'):
         XPIDL_MODULE = 'filepicker'
-        LIBRARY_NAME = 'fileview'
         XPIDL_SOURCES += [
             'nsIFileView.idl',
         ]
         SOURCES += [
             'nsFileView.cpp',
         ]
         EXTRA_COMPONENTS += [
             'nsFilePicker.js',
--- a/toolkit/components/finalizationwitness/moz.build
+++ b/toolkit/components/finalizationwitness/moz.build
@@ -17,11 +17,9 @@ XPIDL_MODULE = 'toolkit_finalizationwitn
 EXPORTS.mozilla += [
     'FinalizationWitnessService.h',
 ]
 
 LOCAL_INCLUDES += [
     '/js/xpconnect/loader',
 ]
 
-LIBRARY_NAME = 'finalizationwitness_s'
-
 FINAL_LIBRARY = 'toolkitcomps'
--- a/toolkit/components/find/moz.build
+++ b/toolkit/components/find/moz.build
@@ -9,11 +9,9 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'mozfind'
 
 SOURCES += [
     'nsFindService.cpp',
 ]
 
-LIBRARY_NAME = 'mozfind_s'
-
 FINAL_LIBRARY = 'toolkitcomps'
--- a/toolkit/components/intl/moz.build
+++ b/toolkit/components/intl/moz.build
@@ -3,11 +3,9 @@
 # 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/.
 
 SOURCES += [
     'nsCharsetMenu.cpp',
 ]
 
-LIBRARY_NAME = 'intl_s'
-
 FINAL_LIBRARY = 'toolkitcomps'
--- a/toolkit/components/jsdownloads/src/moz.build
+++ b/toolkit/components/jsdownloads/src/moz.build
@@ -3,18 +3,16 @@
 # 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/.
 
 SOURCES += [
     'DownloadPlatform.cpp',
 ]
 
-LIBRARY_NAME = 'jsdownloads_s'
-
 EXTRA_COMPONENTS += [
     'DownloadLegacy.js',
     'Downloads.manifest',
 ]
 
 EXTRA_JS_MODULES += [
     'DownloadCore.jsm',
     'DownloadImport.jsm',
--- a/toolkit/components/mediasniffer/moz.build
+++ b/toolkit/components/mediasniffer/moz.build
@@ -14,11 +14,9 @@ SOURCES += [
     'nsMediaSniffer.cpp',
     'nsMediaSnifferModule.cpp',
 ]
 
 SOURCES += [
     'mp3sniff.c',
 ]
 
-LIBRARY_NAME = 'mediasniffer'
-
 FINAL_LIBRARY = 'xul'
--- a/toolkit/components/parentalcontrols/moz.build
+++ b/toolkit/components/parentalcontrols/moz.build
@@ -6,13 +6,12 @@
 
 XPIDL_SOURCES += [
     'nsIParentalControlsService.idl',
 ]
 
 XPIDL_MODULE = 'parentalcontrols'
 
 if not CONFIG['MOZ_DISABLE_PARENTAL_CONTROLS'] and CONFIG['OS_ARCH'] == 'WINNT':
-    LIBRARY_NAME = 'parentalcontrols_s'
     SOURCES += [
         'nsParentalControlsServiceWin.cpp',
     ]
     FINAL_LIBRARY = 'toolkitcomps'
--- a/toolkit/components/perf/moz.build
+++ b/toolkit/components/perf/moz.build
@@ -3,17 +3,15 @@
 # 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/.
 
 SOURCES += [
     'PerfMeasurement.cpp',
 ]
 
-LIBRARY_NAME = 'jsperf'
-
 EXTRA_JS_MODULES += [
     'PerfMeasurement.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
 FINAL_LIBRARY = 'xul'
--- a/toolkit/components/places/moz.build
+++ b/toolkit/components/places/moz.build
@@ -10,17 +10,16 @@ if CONFIG['MOZ_PLACES']:
 XPIDL_SOURCES += [
     'nsINavHistoryService.idl',
 ]
 
 XPIDL_MODULE = 'places'
 
 if CONFIG['MOZ_PLACES']:
     MSVC_ENABLE_PGO = True
-    LIBRARY_NAME = 'places'
 
     XPIDL_SOURCES += [
         'mozIAsyncFavicons.idl',
         'mozIAsyncHistory.idl',
         'mozIAsyncLivemarks.idl',
         'mozIColorAnalyzer.idl',
         'mozIPlacesAutoComplete.idl',
         'nsIAnnotationService.idl',
--- a/toolkit/components/protobuf/moz.build
+++ b/toolkit/components/protobuf/moz.build
@@ -38,11 +38,9 @@ SOURCES += [
     'google/protobuf/io/zero_copy_stream_impl_lite.cc',
     'google/protobuf/message_lite.cc',
     'google/protobuf/repeated_field.cc',
     'google/protobuf/stubs/common.cc',
     'google/protobuf/stubs/once.cc',
     'google/protobuf/wire_format_lite.cc',
 ]
 
-LIBRARY_NAME = 'protobuf_s'
-
 FINAL_LIBRARY = 'toolkitcomps'
--- a/toolkit/components/reflect/moz.build
+++ b/toolkit/components/reflect/moz.build
@@ -3,15 +3,13 @@
 # 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/.
 
 SOURCES += [
     'reflect.cpp',
 ]
 
-LIBRARY_NAME = 'jsreflect'
-
 EXTRA_JS_MODULES += [
     'reflect.jsm',
 ]
 
 FINAL_LIBRARY = 'xul'
--- a/toolkit/components/remote/moz.build
+++ b/toolkit/components/remote/moz.build
@@ -18,11 +18,9 @@ if CONFIG['MOZ_ENABLE_GTK']:
     SOURCES += [
         'nsGTKRemoteService.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     SOURCES += [
         'nsQtRemoteService.cpp',
     ]
 
-LIBRARY_NAME = 'remoteservice'
-
 FINAL_LIBRARY = 'xul'
--- a/toolkit/components/satchel/moz.build
+++ b/toolkit/components/satchel/moz.build
@@ -29,18 +29,16 @@ EXTRA_COMPONENTS += [
     'nsInputListAutoComplete.js',
     'satchel.manifest',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'nsFormHistory.js',
 ]
 
-LIBRARY_NAME = 'satchel'
-
 EXTRA_JS_MODULES += [
     'nsFormAutoCompleteResult.jsm',
 ]
 
 EXTRA_PP_JS_MODULES += [
     'FormHistory.jsm',
 ]
 
--- a/toolkit/components/startup/moz.build
+++ b/toolkit/components/startup/moz.build
@@ -31,11 +31,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
     SOURCES += [
         'nsUserInfoMac.mm',
     ]
 else:
     SOURCES += [
         'nsUserInfoUnix.cpp',
     ]
 
-LIBRARY_NAME = 'appstartup_s'
-
 FINAL_LIBRARY = 'toolkitcomps'
--- a/toolkit/components/statusfilter/moz.build
+++ b/toolkit/components/statusfilter/moz.build
@@ -3,11 +3,9 @@
 # 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/.
 
 SOURCES += [
     'nsBrowserStatusFilter.cpp',
 ]
 
-LIBRARY_NAME = 'mozbrwsr_s'
-
 FINAL_LIBRARY = 'toolkitcomps'
--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -35,13 +35,11 @@ EXTRA_JS_MODULES += [
     'TelemetryStopwatch.jsm',
     'ThirdPartyCookieProbe.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'telemetry'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/toolkit/components/typeaheadfind/moz.build
+++ b/toolkit/components/typeaheadfind/moz.build
@@ -9,11 +9,9 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'fastfind'
 
 SOURCES += [
     'nsTypeAheadFind.cpp',
 ]
 
-LIBRARY_NAME = 'fastfind_s'
-
 FINAL_LIBRARY = 'toolkitcomps'
--- a/toolkit/components/url-classifier/moz.build
+++ b/toolkit/components/url-classifier/moz.build
@@ -37,18 +37,16 @@ EXTRA_COMPONENTS += [
 ]
 
 # Same as JS components that are run through the pre-processor.
 EXTRA_PP_COMPONENTS += [
     'nsUrlClassifierLib.js',
     'nsUrlClassifierListManager.js',
 ]
 
-LIBRARY_NAME = 'urlclassifier_s'
-
 EXTRA_JS_MODULES += [
     'SafeBrowsing.jsm',
 ]
 
 EXPORTS += [
     'Entries.h',
     'LookupCache.h',
     'nsUrlClassifierPrefixSet.h',
--- a/toolkit/crashreporter/breakpad-windows-standalone/moz.build
+++ b/toolkit/crashreporter/breakpad-windows-standalone/moz.build
@@ -1,9 +1,7 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
-LIBRARY_NAME = 'google_breakpad_standalone_s'
-
 FINAL_LIBRARY = 'breakpadinjector'
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build
@@ -4,11 +4,9 @@
 # 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/.
 
 SOURCES += [
     'crash_generation_client.cc',
     'crash_generation_server.cc',
 ]
 
-LIBRARY_NAME = 'crash_generation_s'
-
 FINAL_LIBRARY = 'xulapp_s'
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build
@@ -5,13 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     '../log/log.cc',
     'exception_handler.cc',
     'minidump_descriptor.cc',
 ]
 
-LIBRARY_NAME = 'exception_handler_s'
-
 XPI_NAME = 'crashreporter'
 
 FINAL_LIBRARY = 'xulapp_s'
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build
@@ -5,13 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'linux_dumper.cc',
     'linux_ptrace_dumper.cc',
     'minidump_writer.cc',
 ]
 
-LIBRARY_NAME = 'minidump_writer_s'
-
 XPI_NAME = 'crashreporter'
 
 FINAL_LIBRARY = 'xulapp_s'
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build
@@ -4,13 +4,11 @@
 # 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/.
 
 SOURCES += [
     'crash_generation_client.cc',
     'crash_generation_server.cc',
 ]
 
-LIBRARY_NAME = 'crash_generation_s'
-
 XPI_NAME = 'crashreporter'
 
 FINAL_LIBRARY = 'xulapp_s'
--- a/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build
@@ -6,13 +6,11 @@
 
 SOURCES += [
     'breakpad_nlist_64.cc',
     'dynamic_images.cc',
     'exception_handler.cc',
     'minidump_generator.cc',
 ]
 
-LIBRARY_NAME = 'exception_handler_s'
-
 XPI_NAME = 'crashreporter'
 
 FINAL_LIBRARY = 'xulapp_s'
--- a/toolkit/crashreporter/google-breakpad/src/client/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/moz.build
@@ -3,13 +3,11 @@
 # 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/.
 
 SOURCES += [
     'minidump_file_writer.cc',
 ]
 
-LIBRARY_NAME = 'minidump_file_writer_s'
-
 XPI_NAME = 'crashreporter'
 
 FINAL_LIBRARY = 'xulapp_s'
--- a/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build
@@ -5,13 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'exception_handler.cc',
     'minidump_generator.cc',
     'solaris_lwp.cc',
 ]
 
-LIBRARY_NAME = 'exception_handler_s'
-
 XPI_NAME = 'crashreporter'
 
 FINAL_LIBRARY = 'xulapp_s'
--- a/toolkit/crashreporter/google-breakpad/src/processor/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/processor/moz.build
@@ -16,11 +16,9 @@ SOURCES += [
     'stackwalker_amd64.cc',
     'stackwalker_arm.cc',
     'stackwalker_ppc.cc',
     'stackwalker_sparc.cc',
     'stackwalker_x86.cc',
     'tokenize.cc',
 ]
 
-LIBRARY_NAME = 'breakpad_sps_common_s'
-
 FINAL_LIBRARY = 'xulapp_s'
--- a/toolkit/crashreporter/moz.build
+++ b/toolkit/crashreporter/moz.build
@@ -73,13 +73,11 @@ if CONFIG['OS_ARCH'] == 'Darwin':
 EXTRA_JS_MODULES += [
     'CrashReports.jsm',
     'CrashSubmit.jsm',
     'KeyValueParser.jsm',
 ]
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'exception_handler_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xulapp_s'
--- a/toolkit/devtools/server/moz.build
+++ b/toolkit/devtools/server/moz.build
@@ -11,11 +11,9 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'jsinspector'
 
 SOURCES += [
     'nsJSInspector.cpp',
 ]
 
-LIBRARY_NAME = 'jsinspector'
-
 FINAL_LIBRARY = 'xul'
--- a/toolkit/identity/moz.build
+++ b/toolkit/identity/moz.build
@@ -11,18 +11,16 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'identity'
 
 SOURCES += [
     'IdentityCryptoService.cpp',
 ]
 
-LIBRARY_NAME = 'identity'
-
 JS_MODULES_PATH = 'modules/identity'
 
 EXTRA_JS_MODULES += [
     'Identity.jsm',
     'IdentityProvider.jsm',
     'IdentityStore.jsm',
     'IdentityUtils.jsm',
     'jwcrypto.jsm',
--- a/toolkit/profile/moz.build
+++ b/toolkit/profile/moz.build
@@ -15,16 +15,14 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'toolkitprofile'
 
 SOURCES += [ TOPSRCDIR + '/profile/dirserviceprovider/src/nsProfileLock.cpp' ]
 
 SOURCES += [
     'nsToolkitProfileService.cpp'
 ]
 
-LIBRARY_NAME = 'profile_s'
-
 LOCAL_INCLUDES += [
     '../xre',
     '/profile/dirserviceprovider/src',
 ]
 
 FINAL_LIBRARY = 'xulapp_s'
--- a/toolkit/system/androidproxy/moz.build
+++ b/toolkit/system/androidproxy/moz.build
@@ -3,11 +3,9 @@
 # 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/.
 
 SOURCES += [
     'nsAndroidSystemProxySettings.cpp',
 ]
 
-LIBRARY_NAME = 'androidproxy'
-
 FINAL_LIBRARY = 'xul'
--- a/toolkit/system/osxproxy/moz.build
+++ b/toolkit/system/osxproxy/moz.build
@@ -3,11 +3,9 @@
 # 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/.
 
 SOURCES += [
     'nsOSXSystemProxySettings.mm',
 ]
 
-LIBRARY_NAME = 'osxproxy'
-
 FINAL_LIBRARY = 'xul'
--- a/toolkit/system/unixproxy/moz.build
+++ b/toolkit/system/unixproxy/moz.build
@@ -8,11 +8,9 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']:
     SOURCES += [
         'nsLibProxySettings.cpp',
     ]
 else:
     SOURCES += [
         'nsUnixSystemProxySettings.cpp',
     ]
 
-LIBRARY_NAME = 'unixproxy'
-
 FINAL_LIBRARY = 'xul'
--- a/toolkit/system/windowsproxy/moz.build
+++ b/toolkit/system/windowsproxy/moz.build
@@ -3,11 +3,9 @@
 # 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/.
 
 SOURCES += [
     'nsWindowsSystemProxySettings.cpp',
 ]
 
-LIBRARY_NAME = 'windowsproxy'
-
 FINAL_LIBRARY = 'xul'
--- a/tools/profiler/moz.build
+++ b/tools/profiler/moz.build
@@ -3,17 +3,16 @@
 # 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/.
 
 if CONFIG['MOZ_ENABLE_PROFILER_SPS']:
     FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
     XPIDL_MODULE = 'profiler'
-    LIBRARY_NAME = 'profiler'
     XPIDL_SOURCES += [
         'nsIProfiler.idl',
         'nsIProfileSaveEvent.idl',
     ]
     EXPORTS += [
         'GeckoProfilerFunc.h',
         'GeckoProfilerImpl.h',
         'ProfilerMarkers.h',
--- a/tools/trace-malloc/lib/moz.build
+++ b/tools/trace-malloc/lib/moz.build
@@ -17,11 +17,9 @@ SOURCES += [
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
         'nsDebugHelpWin32.cpp',
         'nsWinTraceMalloc.cpp',
     ]
 
-LIBRARY_NAME = 'tracemalloc'
-
 FINAL_LIBRARY = 'xpcom_core'
--- a/uriloader/base/moz.build
+++ b/uriloader/base/moz.build
@@ -23,15 +23,13 @@ EXPORTS += [
     'nsURILoader.h',
 ]
 
 SOURCES += [
     'nsDocLoader.cpp',
     'nsURILoader.cpp',
 ]
 
-LIBRARY_NAME = 'uriloaderbase_s'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@@ -125,13 +125,11 @@ EXTRA_COMPONENTS += [
 ]
 
 IPDL_SOURCES += [
     'PExternalHelperApp.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'exthandler_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/uriloader/prefetch/moz.build
+++ b/uriloader/prefetch/moz.build
@@ -30,13 +30,11 @@ SOURCES += [
 ]
 
 IPDL_SOURCES += [
     'POfflineCacheUpdate.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'prefetch_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/view/src/moz.build
+++ b/view/src/moz.build
@@ -4,15 +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/.
 
 SOURCES += [
     'nsView.cpp',
     'nsViewManager.cpp',
 ]
 
-LIBRARY_NAME = 'gkview_s'
-
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'
--- a/widget/gonk/nativewindow/moz.build
+++ b/widget/gonk/nativewindow/moz.build
@@ -43,13 +43,11 @@ if CONFIG['MOZ_B2G_CAMERA'] or CONFIG['M
     elif CONFIG['ANDROID_VERSION'] == '15':
         SOURCES += [
             'GonkNativeWindowClientICS.cpp',
             'GonkNativeWindowICS.cpp',
         ]
 
 FAIL_ON_WARNINGS = True
 
-LIBRARY_NAME = 'nativewindow'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/widget/gtkxtbin/moz.build
+++ b/widget/gtkxtbin/moz.build
@@ -3,16 +3,14 @@
 # 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/.
 
 EXPORTS += [
     'gtk2xtbin.h',
 ]
 
-LIBRARY_NAME = 'gtkxtbin'
-
 if CONFIG['MOZ_ENABLE_GTK2']:
     SOURCES += [
         'gtk2xtbin.c',
     ]
 
 FINAL_LIBRARY = 'xul'
--- a/widget/qt/faststartupqt/moz.build
+++ b/widget/qt/faststartupqt/moz.build
@@ -14,11 +14,9 @@ SOURCES += [
     TOPSRCDIR + '/toolkit/xre/nsQAppInstance.cpp',
     TOPSRCDIR + '/widget/qt/mozqglwidgetwrapper.cpp',
 ]
 
 SOURCES += [
     'nsFastStartupQt.cpp',
 ]
 
-LIBRARY_NAME = 'faststartupqt'
-
 FINAL_LIBRARY = 'xul'
--- a/widget/shared/moz.build
+++ b/widget/shared/moz.build
@@ -8,13 +8,11 @@ if CONFIG['MOZ_X11']:
     PARALLEL_DIRS += ['x11']
 
 UNIFIED_SOURCES += [
     'nsShmImage.cpp',
     'SharedWidgetUtils.cpp',
     'WidgetEventImpl.cpp',
 ]
 
-LIBRARY_NAME = 'widget_shared'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xpwidgets_s'
--- a/widget/shared/x11/moz.build
+++ b/widget/shared/x11/moz.build
@@ -3,11 +3,9 @@
 # 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/.
 
 SOURCES += [
     'keysym2ucs.c',
 ]
 
-LIBRARY_NAME = 'widget_shared_x11'
-
 FINAL_LIBRARY = 'xpwidgets_s'
--- a/widget/windows/winrt/moz.build
+++ b/widget/windows/winrt/moz.build
@@ -20,13 +20,11 @@ SOURCES += [
     'UIABridge.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'MetroUIUtils.js',
     'MetroUIUtils.manifest',
 ]
 
-LIBRARY_NAME = 'widget_winrt'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
--- a/widget/xremoteclient/moz.build
+++ b/widget/xremoteclient/moz.build
@@ -1,11 +1,9 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
 PROGRAM = 'mozilla-xremote-client'
 
-LIBRARY_NAME = 'xremote_client_s'
-
 FINAL_LIBRARY = 'xulapp_s'
--- a/xpcom/base/moz.build
+++ b/xpcom/base/moz.build
@@ -123,13 +123,11 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
 SOURCES += [
     'nsErrorAssertsC.c',
 ]
 
 
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'xpcombase_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xpcom_core'
--- a/xpcom/components/moz.build
+++ b/xpcom/components/moz.build
@@ -28,13 +28,11 @@ EXPORTS.mozilla += [
 
 SOURCES += [
     'ManifestParser.cpp',
     'nsCategoryManager.cpp',
     'nsComponentManager.cpp',
     'nsNativeComponentLoader.cpp',
 ]
 
-LIBRARY_NAME = 'xpcomcomponents_s'
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xpcom_core'
--- a/xpcom/ds/moz.build
+++ b/xpcom/ds/moz.build
@@ -106,17 +106,15 @@ elif CONFIG['OS_ARCH'] == 'Darwin':
 elif CONFIG['COMPILE_ENVIRONMENT']:
     error('No TimeStamp implementation on this platform.  Build will not succeed')
 
 EXTRA_COMPONENTS += [
     'nsINIProcessor.js',
     'nsINIProcessor.manifest',
 ]
 
-LIBRARY_NAME = 'xpcomds_s'
-
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../io',
 ]
 
 FINAL_LIBRARY = 'xpcom_core'
--- a/xpcom/io/moz.build
+++ b/xpcom/io/moz.build
@@ -117,13 +117,11 @@ SOURCES += [
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     SOURCES += [
         'CocoaFileUtils.mm',
     ]
 
 MSVC_ENABLE_PGO = True
 
-LIBRARY_NAME = 'xpcomio_s'
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xpcom_core'
--- a/xpcom/reflect/xptcall/src/md/os2/moz.build
+++ b/xpcom/reflect/xptcall/src/md/os2/moz.build
@@ -4,11 +4,9 @@
 # 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/.
 
 SOURCES += [
     '../unix/xptcinvoke_gcc_x86_unix.cpp',
     'xptcstubs_gcc_x86_os2.cpp',
 ]
 
-LIBRARY_NAME = 'xptcmd'
-
 FINAL_LIBRARY = 'xpcom_core'
--- a/xpcom/reflect/xptcall/src/md/unix/moz.build
+++ b/xpcom/reflect/xptcall/src/md/unix/moz.build
@@ -315,11 +315,9 @@ if CONFIG['OS_ARCH'] == 'Linux':
             'xptcstubs_linux_s390.cpp',
         ]
     elif CONFIG['OS_TEST'] == 's390x':
         SOURCES += [
             'xptcinvoke_linux_s390x.cpp',
             'xptcstubs_linux_s390x.cpp',
         ]
 
-LIBRARY_NAME = 'xptcmd'
-
 FINAL_LIBRARY = 'xpcom_core'
--- a/xpcom/reflect/xptcall/src/md/win32/moz.build
+++ b/xpcom/reflect/xptcall/src/md/win32/moz.build
@@ -29,11 +29,9 @@ else:
             'xptcstubs.cpp',
         ]
     else:
         SOURCES += [
             'xptcinvoke.cpp',
             'xptcstubs.cpp',
         ]
 
-LIBRARY_NAME = 'xptcmd'
-
 FINAL_LIBRARY = 'xpcom_core'
--- a/xpcom/reflect/xptcall/src/moz.build
+++ b/xpcom/reflect/xptcall/src/moz.build
@@ -5,17 +5,15 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ['md']
 
 SOURCES += [
     'xptcall.cpp',
 ]
 
-LIBRARY_NAME = 'xptcall'
-
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/xpcom/reflect/xptinfo/src',
 ]
 
 FINAL_LIBRARY = 'xpcom_core'
--- a/xpcom/reflect/xptinfo/src/moz.build
+++ b/xpcom/reflect/xptinfo/src/moz.build
@@ -6,18 +6,16 @@
 
 SOURCES += [
     'xptiInterfaceInfo.cpp',
     'xptiInterfaceInfoManager.cpp',
     'xptiTypelibGuts.cpp',
     'xptiWorkingSet.cpp',
 ]
 
-LIBRARY_NAME = 'xptinfo'
-
 MSVC_ENABLE_PGO = True
 
 # For nsManifestLineReader class.
 LOCAL_INCLUDES += [
     '/xpcom/ds',
 ]
 
 FINAL_LIBRARY = 'xpcom_core'
--- a/xpcom/string/src/moz.build
+++ b/xpcom/string/src/moz.build
@@ -22,13 +22,11 @@ if CONFIG['INTEL_ARCHITECTURE']:
     SOURCES += [
         'nsUTF8UtilsSSE2.cpp',
     ]
 
 LOCAL_INCLUDES += [
     '/mfbt/double-conversion',
 ]
 
-LIBRARY_NAME = 'string_s'
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xpcom_core'
--- a/xpcom/threads/moz.build
+++ b/xpcom/threads/moz.build
@@ -42,17 +42,15 @@ SOURCES += [
     'nsProcessCommon.cpp',
     'nsThread.cpp',
     'nsThreadManager.cpp',
     'nsThreadPool.cpp',
     'nsTimerImpl.cpp',
     'TimerThread.cpp',
 ]
 
-LIBRARY_NAME = 'xpcomthreads_s'
-
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../build',
 ]
 
 FINAL_LIBRARY = 'xpcom_core'
--- a/xpfe/appshell/src/moz.build
+++ b/xpfe/appshell/src/moz.build
@@ -16,13 +16,11 @@ SOURCES += [
     'nsWindowMediator.cpp',
     'nsXULWindow.cpp',
 ]
 
 LOCAL_INCLUDES += [
     '/dom/base',
 ]
 
-LIBRARY_NAME = 'nsappshell'
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'
--- a/xpfe/components/directory/moz.build
+++ b/xpfe/components/directory/moz.build
@@ -9,11 +9,9 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'directory'
 
 SOURCES += [
     'nsDirectoryViewer.cpp',
 ]
 
-LIBRARY_NAME = 'directory_s'
-
 FINAL_LIBRARY = 'appcomps'
--- a/xpfe/components/windowds/moz.build
+++ b/xpfe/components/windowds/moz.build
@@ -9,11 +9,9 @@ XPIDL_SOURCES += [
 ]
 
 XPIDL_MODULE = 'windowds'
 
 SOURCES += [
     'nsWindowDataSource.cpp',
 ]
 
-LIBRARY_NAME = 'windowds'
-
 FINAL_LIBRARY = 'xul'