Bug 882859 - Part b: Move FAIL_ON_WARNINGS into moz.build; r=joey+gps
authorMs2ger <ms2ger@gmail.com>
Thu, 22 Aug 2013 08:55:59 +0200
changeset 143760 9fb5b1f56c2177d2cb6a3f908a11dc8dd71759f4
parent 143759 db29093b48d28d610d65cde6cfdaf8c92440cd6d
child 143761 ea6d4b1744f50cb2da2335431aaedfc79930d2cb
push id25137
push userMs2ger@gmail.com
push dateThu, 22 Aug 2013 06:58:17 +0000
treeherderautoland@2ab07dec6404 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjoey
bugs882859
milestone26.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 882859 - Part b: Move FAIL_ON_WARNINGS into moz.build; r=joey+gps
b2g/components/test/Makefile.in
b2g/components/test/moz.build
content/base/src/Makefile.in
content/base/src/moz.build
content/canvas/compiledtest/Makefile.in
content/canvas/compiledtest/moz.build
content/canvas/src/Makefile.in
content/canvas/src/moz.build
content/events/src/Makefile.in
content/events/src/moz.build
content/html/content/src/Makefile.in
content/html/content/src/moz.build
content/html/document/src/Makefile.in
content/html/document/src/moz.build
content/mathml/content/src/Makefile.in
content/mathml/content/src/moz.build
content/media/Makefile.in
content/media/directshow/Makefile.in
content/media/directshow/moz.build
content/media/encoder/Makefile.in
content/media/encoder/moz.build
content/media/gstreamer/Makefile.in
content/media/gstreamer/moz.build
content/media/mediasource/Makefile.in
content/media/mediasource/moz.build
content/media/moz.build
content/media/ogg/Makefile.in
content/media/ogg/moz.build
content/media/raw/Makefile.in
content/media/raw/moz.build
content/media/wave/Makefile.in
content/media/wave/moz.build
content/media/webaudio/Makefile.in
content/media/webaudio/compiledtest/Makefile.in
content/media/webaudio/compiledtest/moz.build
content/media/webaudio/moz.build
content/media/webm/Makefile.in
content/media/webm/moz.build
content/media/webspeech/synth/Makefile.in
content/media/webspeech/synth/moz.build
content/media/wmf/Makefile.in
content/media/wmf/moz.build
content/smil/Makefile.in
content/smil/moz.build
content/svg/content/src/Makefile.in
content/svg/content/src/moz.build
content/svg/document/src/Makefile.in
content/svg/document/src/moz.build
content/xbl/src/Makefile.in
content/xbl/src/moz.build
content/xml/content/src/Makefile.in
content/xml/content/src/moz.build
content/xml/document/src/Makefile.in
content/xml/document/src/moz.build
content/xslt/src/base/Makefile.in
content/xslt/src/base/moz.build
content/xslt/src/xml/Makefile.in
content/xslt/src/xml/moz.build
content/xslt/src/xpath/Makefile.in
content/xslt/src/xpath/moz.build
content/xslt/src/xslt/Makefile.in
content/xslt/src/xslt/moz.build
content/xul/content/src/Makefile.in
content/xul/content/src/moz.build
content/xul/document/src/Makefile.in
content/xul/document/src/moz.build
docshell/base/Makefile.in
docshell/base/moz.build
docshell/shistory/src/Makefile.in
docshell/shistory/src/moz.build
dom/activities/src/Makefile.in
dom/activities/src/moz.build
dom/activities/tests/Makefile.in
dom/activities/tests/moz.build
dom/alarm/Makefile.in
dom/alarm/moz.build
dom/audiochannel/Makefile.in
dom/audiochannel/moz.build
dom/audiochannel/tests/Makefile.in
dom/audiochannel/tests/moz.build
dom/base/Makefile.in
dom/base/moz.build
dom/battery/Makefile.in
dom/battery/moz.build
dom/bindings/Makefile.in
dom/bindings/moz.build
dom/bluetooth/Makefile.in
dom/bluetooth/moz.build
dom/browser-element/Makefile.in
dom/browser-element/moz.build
dom/camera/Makefile.in
dom/camera/moz.build
dom/cellbroadcast/src/Makefile.in
dom/cellbroadcast/src/moz.build
dom/devicestorage/Makefile.in
dom/devicestorage/moz.build
dom/encoding/Makefile.in
dom/encoding/moz.build
dom/file/Makefile.in
dom/file/moz.build
dom/gamepad/Makefile.in
dom/gamepad/moz.build
dom/icc/src/Makefile.in
dom/icc/src/moz.build
dom/indexedDB/Makefile.in
dom/indexedDB/ipc/Makefile.in
dom/indexedDB/ipc/moz.build
dom/indexedDB/moz.build
dom/ipc/Makefile.in
dom/ipc/moz.build
dom/media/Makefile.in
dom/media/moz.build
dom/mobilemessage/src/Makefile.in
dom/mobilemessage/src/moz.build
dom/network/src/Makefile.in
dom/network/src/moz.build
dom/plugins/base/Makefile.in
dom/plugins/base/android/Makefile.in
dom/plugins/base/android/moz.build
dom/plugins/base/moz.build
dom/plugins/ipc/Makefile.in
dom/plugins/ipc/moz.build
dom/plugins/test/testplugin/Makefile.in
dom/plugins/test/testplugin/moz.build
dom/power/Makefile.in
dom/power/moz.build
dom/promise/Makefile.in
dom/promise/moz.build
dom/quota/Makefile.in
dom/quota/moz.build
dom/src/events/Makefile.in
dom/src/events/moz.build
dom/src/geolocation/Makefile.in
dom/src/geolocation/moz.build
dom/src/json/Makefile.in
dom/src/json/moz.build
dom/src/jsurl/Makefile.in
dom/src/jsurl/moz.build
dom/src/notification/Makefile.in
dom/src/notification/moz.build
dom/src/offline/Makefile.in
dom/src/offline/moz.build
dom/src/storage/Makefile.in
dom/src/storage/moz.build
dom/system/Makefile.in
dom/system/android/Makefile.in
dom/system/android/moz.build
dom/system/gonk/Makefile.in
dom/system/gonk/moz.build
dom/system/mac/Makefile.in
dom/system/mac/moz.build
dom/system/moz.build
dom/system/unix/Makefile.in
dom/system/unix/moz.build
dom/system/windows/Makefile.in
dom/system/windows/moz.build
dom/telephony/Makefile.in
dom/telephony/moz.build
dom/time/Makefile.in
dom/time/moz.build
dom/voicemail/Makefile.in
dom/voicemail/moz.build
dom/workers/Makefile.in
dom/workers/moz.build
editor/Makefile.in
editor/composer/src/Makefile.in
editor/composer/src/moz.build
editor/libeditor/base/Makefile.in
editor/libeditor/base/moz.build
editor/libeditor/html/Makefile.in
editor/libeditor/html/moz.build
editor/libeditor/text/Makefile.in
editor/libeditor/text/moz.build
editor/moz.build
editor/txmgr/src/Makefile.in
editor/txmgr/src/moz.build
editor/txmgr/tests/Makefile.in
editor/txmgr/tests/moz.build
editor/txtsvc/src/Makefile.in
editor/txtsvc/src/moz.build
embedding/browser/build/Makefile.in
embedding/browser/build/moz.build
embedding/browser/webBrowser/Makefile.in
embedding/browser/webBrowser/moz.build
embedding/components/appstartup/src/Makefile.in
embedding/components/appstartup/src/moz.build
embedding/components/build/Makefile.in
embedding/components/build/moz.build
embedding/components/commandhandler/src/Makefile.in
embedding/components/commandhandler/src/moz.build
embedding/components/find/src/Makefile.in
embedding/components/find/src/moz.build
embedding/components/printingui/src/mac/Makefile.in
embedding/components/printingui/src/mac/moz.build
embedding/components/printingui/src/unixshared/Makefile.in
embedding/components/printingui/src/unixshared/moz.build
embedding/components/printingui/src/win/Makefile.in
embedding/components/printingui/src/win/moz.build
embedding/components/webbrowserpersist/src/Makefile.in
embedding/components/webbrowserpersist/src/moz.build
embedding/components/windowwatcher/src/Makefile.in
embedding/components/windowwatcher/src/moz.build
extensions/gio/Makefile.in
extensions/gio/moz.build
gfx/gl/Makefile.in
gfx/gl/moz.build
gfx/src/Makefile.in
gfx/src/moz.build
gfx/thebes/Makefile.in
gfx/thebes/moz.build
hal/Makefile.in
hal/moz.build
image/build/Makefile.in
image/build/moz.build
image/decoders/Makefile.in
image/decoders/icon/Makefile.in
image/decoders/icon/android/Makefile.in
image/decoders/icon/android/moz.build
image/decoders/icon/gtk/Makefile.in
image/decoders/icon/gtk/moz.build
image/decoders/icon/mac/Makefile.in
image/decoders/icon/mac/moz.build
image/decoders/icon/moz.build
image/decoders/icon/win/Makefile.in
image/decoders/icon/win/moz.build
image/decoders/moz.build
image/encoders/bmp/Makefile.in
image/encoders/bmp/moz.build
image/encoders/ico/Makefile.in
image/encoders/ico/moz.build
image/encoders/jpeg/Makefile.in
image/encoders/jpeg/moz.build
image/encoders/png/Makefile.in
image/encoders/png/moz.build
image/src/Makefile.in
image/src/moz.build
ipc/testshell/Makefile.in
ipc/testshell/moz.build
ipc/unixsocket/Makefile.in
ipc/unixsocket/moz.build
js/ipc/Makefile.in
js/ipc/moz.build
js/xpconnect/loader/Makefile.in
js/xpconnect/loader/moz.build
js/xpconnect/src/Makefile.in
js/xpconnect/src/moz.build
js/xpconnect/wrappers/Makefile.in
js/xpconnect/wrappers/moz.build
layout/base/Makefile.in
layout/base/moz.build
layout/build/Makefile.in
layout/build/moz.build
layout/forms/Makefile.in
layout/forms/moz.build
layout/generic/Makefile.in
layout/generic/moz.build
layout/inspector/src/Makefile.in
layout/inspector/src/moz.build
layout/ipc/Makefile.in
layout/ipc/moz.build
layout/mathml/Makefile.in
layout/mathml/moz.build
layout/printing/Makefile.in
layout/printing/moz.build
layout/style/Makefile.in
layout/style/moz.build
layout/svg/Makefile.in
layout/svg/moz.build
layout/tables/Makefile.in
layout/tables/moz.build
layout/tools/layout-debug/src/Makefile.in
layout/tools/layout-debug/src/moz.build
layout/xul/base/src/Makefile.in
layout/xul/base/src/moz.build
layout/xul/grid/Makefile.in
layout/xul/grid/moz.build
layout/xul/tree/Makefile.in
layout/xul/tree/moz.build
media/mtransport/build/Makefile.in
media/mtransport/build/moz.build
media/mtransport/test/Makefile.in
media/mtransport/test/moz.build
modules/libjar/Makefile.in
modules/libjar/moz.build
mozglue/android/Makefile.in
mozglue/android/moz.build
netwerk/base/public/Makefile.in
netwerk/base/public/moz.build
netwerk/base/src/Makefile.in
netwerk/base/src/moz.build
netwerk/build/Makefile.in
netwerk/build/moz.build
netwerk/cache/Makefile.in
netwerk/cache/moz.build
netwerk/cookie/Makefile.in
netwerk/cookie/moz.build
netwerk/dns/Makefile.in
netwerk/dns/moz.build
netwerk/ipc/Makefile.in
netwerk/ipc/moz.build
netwerk/mime/Makefile.in
netwerk/mime/moz.build
netwerk/protocol/about/Makefile.in
netwerk/protocol/about/moz.build
netwerk/protocol/data/Makefile.in
netwerk/protocol/data/moz.build
netwerk/protocol/device/Makefile.in
netwerk/protocol/device/moz.build
netwerk/protocol/file/Makefile.in
netwerk/protocol/file/moz.build
netwerk/protocol/ftp/Makefile.in
netwerk/protocol/ftp/moz.build
netwerk/protocol/http/Makefile.in
netwerk/protocol/http/moz.build
netwerk/protocol/res/Makefile.in
netwerk/protocol/res/moz.build
netwerk/protocol/viewsource/Makefile.in
netwerk/protocol/viewsource/moz.build
netwerk/protocol/websocket/Makefile.in
netwerk/protocol/websocket/moz.build
netwerk/protocol/wyciwyg/Makefile.in
netwerk/protocol/wyciwyg/moz.build
netwerk/sctp/datachannel/Makefile.in
netwerk/sctp/datachannel/moz.build
netwerk/socket/Makefile.in
netwerk/socket/moz.build
netwerk/streamconv/converters/Makefile.in
netwerk/streamconv/converters/moz.build
netwerk/streamconv/public/Makefile.in
netwerk/streamconv/public/moz.build
netwerk/streamconv/src/Makefile.in
netwerk/streamconv/src/moz.build
netwerk/streamconv/test/Makefile.in
netwerk/streamconv/test/moz.build
netwerk/system/android/Makefile.in
netwerk/system/android/moz.build
netwerk/system/mac/Makefile.in
netwerk/system/mac/moz.build
netwerk/system/maemo/Makefile.in
netwerk/system/maemo/moz.build
netwerk/system/qt/Makefile.in
netwerk/system/qt/moz.build
netwerk/system/win32/Makefile.in
netwerk/system/win32/moz.build
netwerk/test/mochitests/Makefile.in
netwerk/test/mochitests/moz.build
netwerk/wifi/Makefile.in
netwerk/wifi/moz.build
security/manager/boot/src/Makefile.in
security/manager/boot/src/moz.build
security/manager/pki/src/Makefile.in
security/manager/pki/src/moz.build
services/crypto/component/Makefile.in
services/crypto/component/moz.build
toolkit/components/autocomplete/Makefile.in
toolkit/components/autocomplete/moz.build
toolkit/components/downloads/Makefile.in
toolkit/components/downloads/moz.build
toolkit/components/perf/Makefile.in
toolkit/components/perf/moz.build
toolkit/components/places/tests/cpp/Makefile.in
toolkit/components/places/tests/cpp/moz.build
toolkit/components/telemetry/Makefile.in
toolkit/components/telemetry/moz.build
toolkit/components/url-classifier/Makefile.in
toolkit/components/url-classifier/moz.build
toolkit/identity/Makefile.in
toolkit/identity/moz.build
toolkit/system/gnome/Makefile.in
toolkit/system/gnome/moz.build
tools/profiler/Makefile.in
tools/profiler/moz.build
uriloader/base/Makefile.in
uriloader/base/moz.build
uriloader/exthandler/Makefile.in
uriloader/exthandler/moz.build
uriloader/prefetch/Makefile.in
uriloader/prefetch/moz.build
view/src/Makefile.in
view/src/moz.build
webapprt/gtk2/Makefile.in
webapprt/gtk2/moz.build
widget/android/Makefile.in
widget/android/moz.build
widget/gonk/nativewindow/Makefile.in
widget/gonk/nativewindow/moz.build
widget/gtk2/Makefile.in
widget/gtk2/moz.build
widget/tests/Makefile.in
widget/tests/moz.build
deleted file mode 100644
--- a/b2g/components/test/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-# vim: noexpandtab ts=8 sw=8
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-FAIL_ON_WARNINGS := 1
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
--- a/b2g/components/test/moz.build
+++ b/b2g/components/test/moz.build
@@ -2,8 +2,11 @@
 # 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/.
 
 MODULE = 'B2GComponents'
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+FAIL_ON_WARNINGS = True
+
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconbase_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 ifdef MOZ_WEBRTC
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/netwerk/sctp/datachannel \
 		$(NULL)
 endif
 
 GQI_SRCS = contentbase.gqi
 
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -164,8 +164,11 @@ EXTRA_COMPONENTS += [
 
 EXTRA_PP_COMPONENTS += [
     'contentSecurityPolicy.js',
 ]
 
 EXTRA_JS_MODULES += [
     'CSPUtils.jsm',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/content/canvas/compiledtest/Makefile.in
+++ b/content/canvas/compiledtest/Makefile.in
@@ -2,17 +2,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/.
 
 DEPTH := @DEPTH@
 topsrcdir := @top_srcdir@
 srcdir := @srcdir@
 VPATH := @srcdir@
 
-FAIL_ON_WARNINGS = 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LOCAL_INCLUDES := \
   -I$(srcdir)/../src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/content/canvas/compiledtest/moz.build
+++ b/content/canvas/compiledtest/moz.build
@@ -3,8 +3,10 @@
 # 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/.
 
 CPP_UNIT_TESTS += [
     'TestWebGLElementArrayCache.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconcvs_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY  = 1
-FAIL_ON_WARNINGS = 1
-
 ifdef MOZ_WEBGL
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/js/xpconnect/wrappers \
 	$(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/content/canvas/src/moz.build
+++ b/content/canvas/src/moz.build
@@ -68,8 +68,11 @@ if CONFIG['MOZ_WEBGL']:
         'WebGLTexture.cpp',
         'WebGLUniformLocation.cpp',
         'WebGLVertexArray.cpp',
     ]
 else:
     CPP_SOURCES += [
         'WebGLContextNotSupported.cpp',
     ]
+
+FAIL_ON_WARNINGS = True
+
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconevents_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY  = 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES	+= \
              -I$(srcdir)/../../base/src \
              -I$(srcdir)/../../html/content/src \
              -I$(srcdir)/../../xul/content/src \
              -I$(srcdir)/../../xml/content/src \
--- a/content/events/src/moz.build
+++ b/content/events/src/moz.build
@@ -61,8 +61,11 @@ CPP_SOURCES += [
     'nsEventStateManager.cpp',
     'nsIMEStateManager.cpp',
     'nsPaintRequest.cpp',
     'nsPrivateTextRange.cpp',
 ]
 
 if CONFIG['MOZ_WEBSPEECH']:
     CPP_SOURCES += ['SpeechRecognitionError.cpp']
+
+FAIL_ON_WARNINGS = True
+
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconhtmlcon_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 INCLUDES	+= \
 		-I$(srcdir)/../../document/src \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../events/src \
 		-I$(srcdir)/../../../xbl/src \
--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -149,8 +149,10 @@ CPP_SOURCES += [
     'nsGenericHTMLFrameElement.cpp',
     'nsHTMLDNSPrefetch.cpp',
     'HTMLFormElement.cpp',
     'nsIConstraintValidation.cpp',
     'nsRadioVisitor.cpp',
     'nsTextEditorState.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@@ -7,18 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../events/src \
 		-I$(srcdir)/../../content/src \
 		-I$(topsrcdir)/layout/style \
 		-I$(topsrcdir)/dom/base \
--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@@ -20,8 +20,10 @@ CPP_SOURCES += [
     'PluginDocument.cpp',
     'VideoDocument.cpp',
     'nsHTMLContentSink.cpp',
     'nsHTMLDocument.cpp',
 ]
 
 LIBRARY_NAME = 'gkconhtmldoc_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/content/mathml/content/src/Makefile.in
+++ b/content/mathml/content/src/Makefile.in
@@ -7,16 +7,14 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkcontentmathml_s
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 INCLUDES += \
   -I$(srcdir)/../../../base/src \
   $(NULL)
--- a/content/mathml/content/src/moz.build
+++ b/content/mathml/content/src/moz.build
@@ -6,8 +6,10 @@
 
 MODULE = 'content'
 
 CPP_SOURCES += [
     'nsMathMLElement.cpp',
     'nsMathMLElementFactory.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = gkconmedia_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES  += \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/layout/generic \
   -I$(topsrcdir)/layout/xul/base/src \
   $(NULL)
--- a/content/media/directshow/Makefile.in
+++ b/content/media/directshow/Makefile.in
@@ -4,18 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FAIL_ON_WARNINGS := 1
-
 LIBRARY_NAME	= gkcondirectshow_s
 LIBXUL_LIBRARY 	= 1
 
 LOCAL_INCLUDES += -I$(topsrcdir)/media/webrtc/trunk/webrtc/modules/video_capture/windows/
 
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
--- a/content/media/directshow/moz.build
+++ b/content/media/directshow/moz.build
@@ -28,8 +28,11 @@ CPP_SOURCES += [
 # they're available at link time.
 if not CONFIG['MOZ_WEBRTC_IN_LIBXUL']:
     CPP_SOURCES += [
         TOPSRCDIR + '/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseFilter.cpp',
         TOPSRCDIR + '/media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseInputPin.cpp',
         TOPSRCDIR + '/media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.cpp',
         TOPSRCDIR + '/media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp',
     ]
+
+FAIL_ON_WARNINGS = True
+
--- a/content/media/encoder/Makefile.in
+++ b/content/media/encoder/Makefile.in
@@ -5,12 +5,9 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
-
 include $(topsrcdir)/config/rules.mk
--- a/content/media/encoder/moz.build
+++ b/content/media/encoder/moz.build
@@ -18,8 +18,10 @@ CPP_SOURCES += [
 ]
 
 if CONFIG['MOZ_OPUS']:
     EXPORTS += ['OpusTrackEncoder.h']
     CPP_SOURCES += ['OpusTrackEncoder.cpp']
 
 LIBRARY_NAME = 'gkconencoder_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/content/media/gstreamer/Makefile.in
+++ b/content/media/gstreamer/Makefile.in
@@ -1,18 +1,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY 	= 1
 
 include $(topsrcdir)/config/rules.mk
 
 CFLAGS		+= $(GSTREAMER_CFLAGS)
 CXXFLAGS	+= $(GSTREAMER_CFLAGS)
--- a/content/media/gstreamer/moz.build
+++ b/content/media/gstreamer/moz.build
@@ -18,8 +18,10 @@ CPP_SOURCES += [
     'GStreamerFormatHelper.cpp',
     'GStreamerReader.cpp',
     'GStreamerMozVideoBuffer.cpp',
     'GStreamerLoader.cpp',
 ]
 
 LIBRARY_NAME = 'gkcongstreamer_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/content/media/mediasource/Makefile.in
+++ b/content/media/mediasource/Makefile.in
@@ -1,16 +1,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconmediasource_s
 LIBXUL_LIBRARY 	= 1
 
 include $(topsrcdir)/config/rules.mk
--- a/content/media/mediasource/moz.build
+++ b/content/media/mediasource/moz.build
@@ -21,8 +21,10 @@ EXPORTS.mozilla.dom += [
 
 CPP_SOURCES += [
     'MediaSource.cpp',
     'MediaSourceInputAdapter.cpp',
     'SourceBuffer.cpp',
     'SourceBufferList.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/content/media/moz.build
+++ b/content/media/moz.build
@@ -125,12 +125,15 @@ CPP_SOURCES += [
     'VideoFrameContainer.cpp',
     'VideoPlaybackQuality.cpp',
     'VideoSegment.cpp',
     'VideoStreamTrack.cpp',
     'VideoUtils.cpp',
     'WebVTTLoadListener.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
+
 if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']:
     CPP_SOURCES += [
         'AudioNodeEngineNEON.cpp',
     ]
--- a/content/media/ogg/Makefile.in
+++ b/content/media/ogg/Makefile.in
@@ -5,12 +5,9 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY 	= 1
-FAIL_ON_WARNINGS := 1
-
-
 include $(topsrcdir)/config/rules.mk
--- a/content/media/ogg/moz.build
+++ b/content/media/ogg/moz.build
@@ -17,8 +17,10 @@ CPP_SOURCES += [
     'OggCodecState.cpp',
     'OggDecoder.cpp',
     'OggReader.cpp',
     'OggWriter.cpp',
 ]
 
 LIBRARY_NAME = 'gkconogg_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/content/media/raw/Makefile.in
+++ b/content/media/raw/Makefile.in
@@ -6,16 +6,14 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../html/content/src \
 		$(NULL)
--- a/content/media/raw/moz.build
+++ b/content/media/raw/moz.build
@@ -14,8 +14,10 @@ EXPORTS += [
 
 CPP_SOURCES += [
     'RawDecoder.cpp',
     'RawReader.cpp',
 ]
 
 LIBRARY_NAME = 'gkconraw_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/content/media/wave/Makefile.in
+++ b/content/media/wave/Makefile.in
@@ -1,16 +1,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY 	= 1
 
 
 include $(topsrcdir)/config/rules.mk
--- a/content/media/wave/moz.build
+++ b/content/media/wave/moz.build
@@ -13,8 +13,10 @@ EXPORTS += [
 
 CPP_SOURCES += [
     'WaveDecoder.cpp',
     'WaveReader.cpp',
 ]
 
 LIBRARY_NAME = 'gkconwave_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/content/media/webaudio/Makefile.in
+++ b/content/media/webaudio/Makefile.in
@@ -6,12 +6,10 @@ DEPTH            := @DEPTH@
 topsrcdir        := @top_srcdir@
 srcdir           := @srcdir@
 VPATH            := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   := gkconwebaudio_s
 LIBXUL_LIBRARY := 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/content/media/webaudio/compiledtest/Makefile.in
+++ b/content/media/webaudio/compiledtest/Makefile.in
@@ -5,13 +5,11 @@
 DEPTH          := @DEPTH@
 topsrcdir      := @top_srcdir@
 srcdir         := @srcdir@
 VPATH          := @srcdir@
 relativesrcdir := @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FAIL_ON_WARNINGS = 1
-
 LOCAL_INCLUDES := -I$(srcdir)/..
 
 include $(topsrcdir)/config/rules.mk
--- a/content/media/webaudio/compiledtest/moz.build
+++ b/content/media/webaudio/compiledtest/moz.build
@@ -3,8 +3,10 @@
 # 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/.
 
 CPP_UNIT_TESTS += [
     'TestAudioEventTimeline.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/content/media/webaudio/moz.build
+++ b/content/media/webaudio/moz.build
@@ -79,8 +79,10 @@ CPP_SOURCES += [
     'PannerNode.cpp',
     'PeriodicWave.cpp',
     'ScriptProcessorNode.cpp',
     'ThreeDPoint.cpp',
     'WaveShaperNode.cpp',
     'WebAudioUtils.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/content/media/webm/Makefile.in
+++ b/content/media/webm/Makefile.in
@@ -1,18 +1,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY 	= 1
 
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
--- a/content/media/webm/moz.build
+++ b/content/media/webm/moz.build
@@ -14,8 +14,10 @@ EXPORTS += [
 CPP_SOURCES += [
     'WebMBufferedParser.cpp',
     'WebMDecoder.cpp',
     'WebMReader.cpp',
 ]
 
 LIBRARY_NAME = 'gkconwebm_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/content/media/webspeech/synth/Makefile.in
+++ b/content/media/webspeech/synth/Makefile.in
@@ -1,19 +1,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/.
 
 DEPTH            := @DEPTH@
 topsrcdir        := @top_srcdir@
 srcdir           := @srcdir@
 VPATH            := @srcdir@
-FAIL_ON_WARNINGS := 1
-
-
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/dom/dom-config.mk
 
 VPATH += \
   $(srcdir)/ipc \
   $(NULL)
 
 LIBRARY_NAME   := gkconwebspeechsynth_s
--- a/content/media/webspeech/synth/moz.build
+++ b/content/media/webspeech/synth/moz.build
@@ -37,8 +37,11 @@ if CONFIG['MOZ_WEBSPEECH']:
         'nsSpeechTask.cpp',
         'nsSynthVoiceRegistry.cpp',
     ]
 
 IPDL_SOURCES += [
     'ipc/PSpeechSynthesis.ipdl',
     'ipc/PSpeechSynthesisRequest.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/content/media/wmf/Makefile.in
+++ b/content/media/wmf/Makefile.in
@@ -1,18 +1,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY 	= 1
 
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
 
--- a/content/media/wmf/moz.build
+++ b/content/media/wmf/moz.build
@@ -18,8 +18,10 @@ CPP_SOURCES += [
     'WMFDecoder.cpp',
     'WMFReader.cpp',
     'WMFSourceReaderCallback.cpp',
     'WMFUtils.cpp',
 ]
 
 LIBRARY_NAME = 'gkconwmf_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/content/smil/Makefile.in
+++ b/content/smil/Makefile.in
@@ -7,17 +7,15 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconsmil_s
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 LOCAL_INCLUDES += 	\
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../layout/style \
 		-I$(srcdir)/../events/src \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/content/smil/moz.build
+++ b/content/smil/moz.build
@@ -56,8 +56,10 @@ CPP_SOURCES += [
     'nsSMILSetAnimationFunction.cpp',
     'nsSMILTimeContainer.cpp',
     'nsSMILTimeValue.cpp',
     'nsSMILTimeValueSpec.cpp',
     'nsSMILTimedElement.cpp',
     'nsSMILValue.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@@ -7,18 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkcontentsvg_s
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS	= 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 INCLUDES += 	\
 		-I$(srcdir)/../../../xml/content/src \
 		-I$(srcdir)/../../../../dom \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../../layout/generic \
--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@@ -239,8 +239,10 @@ CPP_SOURCES += [
     'nsSVGPathDataParser.cpp',
     'nsSVGPathGeometryElement.cpp',
     'nsSVGPolyElement.cpp',
     'nsSVGString.cpp',
     'nsSVGTransform.cpp',
     'nsSVGViewBox.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/content/svg/document/src/Makefile.in
+++ b/content/svg/document/src/Makefile.in
@@ -6,18 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir) \
 		-I$(srcdir)/../../../xml/document/src \
 		-I$(srcdir)/../../../html/document/src \
 		-I$(srcdir)/../../../../layout/style \
 		-I$(srcdir)/../../../base/src \
--- a/content/svg/document/src/moz.build
+++ b/content/svg/document/src/moz.build
@@ -11,8 +11,10 @@ EXPORTS.mozilla.dom += [
 ]
 
 CPP_SOURCES += [
     'SVGDocument.cpp',
 ]
 
 LIBRARY_NAME = 'gkconsvgdoc_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconxbl_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../html/document/src \
 		-I$(srcdir)/../../xml/document/src \
 		-I$(srcdir)/../../xul/content/src \
 		-I$(srcdir)/../../xul/document/src \
--- a/content/xbl/src/moz.build
+++ b/content/xbl/src/moz.build
@@ -31,8 +31,10 @@ CPP_SOURCES += [
     'nsXBLPrototypeResources.cpp',
     'nsXBLResourceLoader.cpp',
     'nsXBLSerialize.cpp',
     'nsXBLService.cpp',
     'nsXBLWindowKeyHandler.cpp',
     'XBLChildrenElement.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@@ -7,18 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir)/../../../base/src \
 		$(NULL)
 
 EXPORT_RESOURCE_CONTENT = \
 		$(srcdir)/htmlmathml-f.ent \
--- a/content/xml/content/src/moz.build
+++ b/content/xml/content/src/moz.build
@@ -17,8 +17,10 @@ CPP_SOURCES += [
     'CDATASection.cpp',
     'ProcessingInstruction.cpp',
     'XMLStylesheetProcessingInstruction.cpp',
     'nsXMLElement.cpp',
 ]
 
 LIBRARY_NAME = 'gkconxmlcon_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@@ -7,18 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../../../html/document/src \
 		-I$(srcdir)/../../../../layout/style \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../xul/content/src \
--- a/content/xml/document/src/moz.build
+++ b/content/xml/document/src/moz.build
@@ -14,8 +14,10 @@ CPP_SOURCES += [
     'XMLDocument.cpp',
     'nsXMLContentSink.cpp',
     'nsXMLFragmentContentSink.cpp',
     'nsXMLPrettyPrinter.cpp',
 ]
 
 LIBRARY_NAME = 'gkconxmldoc_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/content/xslt/src/base/Makefile.in
+++ b/content/xslt/src/base/Makefile.in
@@ -5,18 +5,16 @@
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
 	-I$(srcdir)/../../public \
 	-I$(srcdir) \
 	-I$(srcdir)/../xml \
 	-I$(srcdir)/../xpath \
 	-I$(srcdir)/../xslt \
--- a/content/xslt/src/base/moz.build
+++ b/content/xslt/src/base/moz.build
@@ -11,8 +11,10 @@ CPP_SOURCES += [
     'txExpandedNameMap.cpp',
     'txList.cpp',
     'txNamespaceMap.cpp',
     'txURIUtils.cpp',
 ]
 
 LIBRARY_NAME = 'txbase_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/content/xslt/src/xml/Makefile.in
+++ b/content/xslt/src/xml/Makefile.in
@@ -5,18 +5,16 @@
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
 	-I$(srcdir)/../base \
 	-I$(srcdir) \
 	-I$(srcdir)/../xpath \
 	-I$(srcdir)/../xslt \
 	-I$(srcdir)/../../../base/src \
--- a/content/xslt/src/xml/moz.build
+++ b/content/xslt/src/xml/moz.build
@@ -8,8 +8,10 @@ MODULE = 'transformiix'
 
 CPP_SOURCES += [
     'txXMLParser.cpp',
     'txXMLUtils.cpp',
 ]
 
 LIBRARY_NAME = 'txxml_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/content/xslt/src/xpath/Makefile.in
+++ b/content/xslt/src/xpath/Makefile.in
@@ -5,18 +5,16 @@
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
 	-I$(srcdir)/../base \
 	-I$(srcdir)/../xml \
 	-I$(srcdir) \
 	-I$(srcdir)/../xslt \
 	$(NULL)
--- a/content/xslt/src/xpath/moz.build
+++ b/content/xslt/src/xpath/moz.build
@@ -44,8 +44,10 @@ CPP_SOURCES += [
     'txUnionNodeTest.cpp',
     'txVariableRefExpr.cpp',
     'txXPCOMExtensionFunction.cpp',
     'txXPathOptimizer.cpp',
 ]
 
 LIBRARY_NAME = 'txxpath_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/content/xslt/src/xslt/Makefile.in
+++ b/content/xslt/src/xslt/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
 
 # For nsDependentJSString
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/content/xslt/src/xslt/moz.build
+++ b/content/xslt/src/xslt/moz.build
@@ -41,8 +41,10 @@ CPP_SOURCES += [
 
 EXTRA_COMPONENTS += [
     'txEXSLTRegExFunctions.js',
     'txEXSLTRegExFunctions.manifest',
 ]
 
 LIBRARY_NAME = 'txxslt_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/content/xul/content/src/Makefile.in
+++ b/content/xul/content/src/Makefile.in
@@ -2,27 +2,23 @@
 # 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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS = 1
-
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_XUL
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 endif
 
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 	-I$(srcdir)/../../document/src \
 	-I$(srcdir)/../../templates/src \
 	-I$(srcdir)/../../../xml/content/src \
 	-I$(srcdir)/../../../base/src \
 	-I$(srcdir)/../../../xml/document/src \
--- a/content/xul/content/src/moz.build
+++ b/content/xul/content/src/moz.build
@@ -8,8 +8,11 @@ MODULE = 'xul'
 
 if CONFIG['MOZ_XUL']:
     CPP_SOURCES += [
         'nsXULElement.cpp',
         'nsXULPopupListener.cpp',
         'nsXULContextMenuBuilder.cpp',
     ]
     LIBRARY_NAME = 'gkconxulcon_s'
+
+FAIL_ON_WARNINGS = True
+
--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@@ -7,18 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
 		  -I$(srcdir)/../../content/src \
 		  -I$(srcdir)/../../templates/src \
 		  -I$(srcdir)/../../../../layout/base \
 		  -I$(srcdir)/../../../../layout/generic \
 		  -I$(srcdir)/../../../../layout/style \
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@@ -16,8 +16,10 @@ if CONFIG['MOZ_XUL']:
         'nsXULContentSink.cpp',
         'XULDocument.cpp',
         'nsXULPrototypeCache.cpp',
         'nsXULPrototypeDocument.cpp',
     ]
 
 LIBRARY_NAME = 'gkconxuldoc_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FAIL_ON_WARNINGS := 1
 LIBRARY_NAME   = basedocshell_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
 ifdef MOZ_TOOLKIT_SEARCH
 DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif
 
--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -57,8 +57,10 @@ CPP_SOURCES += [
     'nsDocShellEditorData.cpp',
     'nsDocShellEnumerator.cpp',
     'nsDocShellLoadInfo.cpp',
     'nsDocShellTransferableHooks.cpp',
     'nsDownloadHistory.cpp',
     'nsWebNavigationInfo.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/docshell/shistory/src/Makefile.in
+++ b/docshell/shistory/src/Makefile.in
@@ -7,13 +7,11 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += -I$(srcdir)/../../base
--- a/docshell/shistory/src/moz.build
+++ b/docshell/shistory/src/moz.build
@@ -14,8 +14,10 @@ CPP_SOURCES += [
     'nsSHEntry.cpp',
     'nsSHEntryShared.cpp',
     'nsSHTransaction.cpp',
     'nsSHistory.cpp',
 ]
 
 LIBRARY_NAME = 'shistory_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/activities/src/Makefile.in
+++ b/dom/activities/src/Makefile.in
@@ -6,13 +6,11 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_activities_s
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/activities/src/moz.build
+++ b/dom/activities/src/moz.build
@@ -22,8 +22,11 @@ EXTRA_COMPONENTS += [
     'ActivityRequestHandler.js',
     'ActivityWrapper.js',
 ]
 
 EXTRA_JS_MODULES += [
     'ActivitiesService.jsm',
     'ActivitiesServiceFilter.jsm',
 ]
+
+FAIL_ON_WARNINGS = True
+
deleted file mode 100644
--- a/dom/activities/tests/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-FAIL_ON_WARNINGS := 1
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
--- a/dom/activities/tests/moz.build
+++ b/dom/activities/tests/moz.build
@@ -1,7 +1,10 @@
 # -*- 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/.
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/alarm/Makefile.in
+++ b/dom/alarm/Makefile.in
@@ -6,16 +6,14 @@ DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME        = domalarm_s
 LIBXUL_LIBRARY      = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
--- a/dom/alarm/moz.build
+++ b/dom/alarm/moz.build
@@ -27,8 +27,11 @@ EXTRA_COMPONENTS += [
     'AlarmsManager.js',
     'AlarmsManager.manifest',
 ]
 
 EXTRA_JS_MODULES += [
     'AlarmDB.jsm',
     'AlarmService.jsm',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/audiochannel/Makefile.in
+++ b/dom/audiochannel/Makefile.in
@@ -17,13 +17,11 @@ topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domaudiochannel_s
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
--- a/dom/audiochannel/moz.build
+++ b/dom/audiochannel/moz.build
@@ -22,8 +22,10 @@ EXPORTS += [
 ]
 
 CPP_SOURCES += [
     'AudioChannelAgent.cpp',
     'AudioChannelService.cpp',
     'AudioChannelServiceChild.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
deleted file mode 100644
--- a/dom/audiochannel/tests/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-FAIL_ON_WARNINGS = 1
-
-include $(topsrcdir)/config/rules.mk
-
--- a/dom/audiochannel/tests/moz.build
+++ b/dom/audiochannel/tests/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'dom'
 
 CPP_UNIT_TESTS += [
     'TestAudioChannelService.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@@ -7,19 +7,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= jsdombase_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS := 1
-
-
 include $(topsrcdir)/dom/dom-config.mk
 
 ifdef MOZ_JSDEBUGGER
 DEFINES += -DMOZ_JSDEBUGGER
 endif
 
 ifdef MOZ_B2G_RIL
 DEFINES += -DMOZ_B2G_RIL
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -103,8 +103,11 @@ EXTRA_COMPONENTS += [
 ]
 
 EXTRA_JS_MODULES += [
     'ConsoleAPIStorage.jsm',
     'DOMRequestHelper.jsm',
     'IndexedDBHelper.jsm',
     'ObjectWrapper.jsm',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/battery/Makefile.in
+++ b/dom/battery/Makefile.in
@@ -6,18 +6,16 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_battery_s
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/battery/moz.build
+++ b/dom/battery/moz.build
@@ -10,8 +10,10 @@ EXPORTS.mozilla.dom.battery += [
     'Constants.h',
     'Types.h',
 ]
 
 CPP_SOURCES += [
     'BatteryManager.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@@ -8,17 +8,16 @@ srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dombindings_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
 
 # Need this to find all our DOM source files.
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/dom/webidl/WebIDL.mk
 
 binding_include_path := mozilla/dom
 all_webidl_files = $(webidl_files) $(generated_webidl_files) $(preprocessed_webidl_files)
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -20,8 +20,11 @@ EXPORTS.mozilla.dom += [
     'DOMJSProxyHandler.h',
     'Date.h',
     'Errors.msg',
     'NonRefcountedDOMObject.h',
     'Nullable.h',
     'PrimitiveConversions.h',
     'TypedArray.h',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/bluetooth/Makefile.in
+++ b/dom/bluetooth/Makefile.in
@@ -11,18 +11,16 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/dom/dom-config.mk
 
 VPATH += $(srcdir)/ipc
 
 ifneq (,$(MOZ_B2G_BT))
 
 LIBRARY_NAME     = dombluetooth_s
--- a/dom/bluetooth/moz.build
+++ b/dom/bluetooth/moz.build
@@ -68,8 +68,11 @@ EXPORTS.mozilla.dom.bluetooth += [
     'BluetoothCommon.h',
 ]
 
 IPDL_SOURCES += [
     'ipc/BluetoothTypes.ipdlh',
     'ipc/PBluetooth.ipdl',
     'ipc/PBluetoothRequest.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/browser-element/Makefile.in
+++ b/dom/browser-element/Makefile.in
@@ -6,18 +6,16 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_browserelement_s
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 INCLUDES	+= \
 		-I$(topsrcdir)/dom/base \
--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@@ -34,8 +34,11 @@ EXTRA_COMPONENTS += [
     'BrowserElementParent.js',
     'BrowserElementParent.manifest',
 ]
 
 EXTRA_JS_MODULES += [
     'BrowserElementParent.jsm',
     'BrowserElementPromptService.jsm',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/camera/Makefile.in
+++ b/dom/camera/Makefile.in
@@ -6,14 +6,12 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domcamera_s
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
--- a/dom/camera/moz.build
+++ b/dom/camera/moz.build
@@ -39,8 +39,11 @@ if CONFIG['MOZ_B2G_CAMERA']:
         'AudioParameter.cpp',
         'GonkRecorderProfiles.cpp',
     ]
 else:
     CPP_SOURCES += [
         'FallbackCameraManager.cpp',
         'FallbackCameraControl.cpp',
     ]
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/cellbroadcast/src/Makefile.in
+++ b/dom/cellbroadcast/src/Makefile.in
@@ -6,13 +6,11 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_cellbroadcast_s
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/cellbroadcast/src/moz.build
+++ b/dom/cellbroadcast/src/moz.build
@@ -9,8 +9,10 @@ XPIDL_MODULE = 'dom_cellbroadcast'
 EXPORTS.mozilla.dom += [
     'CellBroadcast.h',
 ]
 
 CPP_SOURCES += [
     'CellBroadcast.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/devicestorage/Makefile.in
+++ b/dom/devicestorage/Makefile.in
@@ -6,18 +6,16 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domdevicestorage_s
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/dom/ipc \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)
--- a/dom/devicestorage/moz.build
+++ b/dom/devicestorage/moz.build
@@ -24,8 +24,11 @@ CPP_SOURCES += [
     'DeviceStorageRequestChild.cpp',
     'DeviceStorageRequestParent.cpp',
     'nsDeviceStorage.cpp',
 ]
 
 IPDL_SOURCES += [
     'PDeviceStorageRequest.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/encoding/Makefile.in
+++ b/dom/encoding/Makefile.in
@@ -1,18 +1,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= domencoding_s
 LIBXUL_LIBRARY	= 1
 
 LOCAL_INCLUDES = \
 	-I$(topsrcdir)/intl/locale/src \
 	$(NULL)
--- a/dom/encoding/moz.build
+++ b/dom/encoding/moz.build
@@ -17,8 +17,10 @@ EXPORTS.mozilla.dom += [
 ]
 
 CPP_SOURCES += [
     'EncodingUtils.cpp',
     'TextDecoder.cpp',
     'TextEncoder.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/file/Makefile.in
+++ b/dom/file/Makefile.in
@@ -6,14 +6,12 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domfile_s
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/file/moz.build
+++ b/dom/file/moz.build
@@ -50,8 +50,10 @@ CPP_SOURCES += [
     'FileRequest.cpp',
     'FileService.cpp',
     'FileStreamWrappers.cpp',
     'LockedFile.cpp',
     'MemoryStreams.cpp',
     'MetadataHelper.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/gamepad/Makefile.in
+++ b/dom/gamepad/Makefile.in
@@ -6,16 +6,14 @@ DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domgamepad_s
 LIBXUL_LIBRARY  = 1
-FAIL_ON_WARNINGS := 1
-
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/gamepad/moz.build
+++ b/dom/gamepad/moz.build
@@ -8,8 +8,11 @@ EXPORTS.mozilla.dom += [
     'Gamepad.h',
     'GamepadService.h',
     ]
 
 CPP_SOURCES = [
     'Gamepad.cpp',
     'GamepadService.cpp',
     ]
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/icc/src/Makefile.in
+++ b/dom/icc/src/Makefile.in
@@ -6,18 +6,16 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = $(srcdir)
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_icc_s
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/icc/src/moz.build
+++ b/dom/icc/src/moz.build
@@ -8,8 +8,10 @@ EXPORTS.mozilla.dom.icc += [
     'StkCommandEvent.h',
 ]
 
 CPP_SOURCES += [
     'IccManager.cpp',
     'StkCommandEvent.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@@ -6,18 +6,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = dom_indexeddb_s
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/caps/include \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/db/sqlite3/src \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/src/storage \
   -I$(topsrcdir)/dom/quota \
--- a/dom/indexedDB/ipc/Makefile.in
+++ b/dom/indexedDB/ipc/Makefile.in
@@ -2,18 +2,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/.
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 relativesrcdir = @relativesrcdir@
 VPATH = @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = dom_indexeddb_ipc_s
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/indexedDB \
   -I$(topsrcdir)/content/events/src \
--- a/dom/indexedDB/ipc/moz.build
+++ b/dom/indexedDB/ipc/moz.build
@@ -24,8 +24,11 @@ IPDL_SOURCES += [
     'PIndexedDBCursor.ipdl',
     'PIndexedDBDatabase.ipdl',
     'PIndexedDBDeleteDatabaseRequest.ipdl',
     'PIndexedDBIndex.ipdl',
     'PIndexedDBObjectStore.ipdl',
     'PIndexedDBRequest.ipdl',
     'PIndexedDBTransaction.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@@ -58,8 +58,10 @@ CPP_SOURCES += [
     'IDBWrapperCache.cpp',
     'IndexedDatabaseManager.cpp',
     'Key.cpp',
     'KeyPath.cpp',
     'OpenDatabaseHelper.cpp',
     'TransactionThreadPool.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/ipc/Makefile.in
+++ b/dom/ipc/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = domipc_s
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES += \
 	-I$(srcdir)/../../content/base/src \
 	-I$(srcdir)/../../content/events/src \
 	-I$(srcdir)/../../docshell/base \
 	-I$(topsrcdir)/chrome/src \
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -65,8 +65,11 @@ IPDL_SOURCES += [
     'PContent.ipdl',
     'PContentDialog.ipdl',
     'PContentPermissionRequest.ipdl',
     'PCrashReporter.ipdl',
     'PDocumentRenderer.ipdl',
     'PMemoryReportRequest.ipdl',
     'PTabContext.ipdlh',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/media/Makefile.in
+++ b/dom/media/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_media_s
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 
 ifdef MOZ_WEBRTC
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/media/webrtc/trunk/webrtc \
   -I$(topsrcdir)/media/webrtc/signaling/src/common \
   $(NULL)
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -26,8 +26,11 @@ EXPORTS.mozilla += [
 CPP_SOURCES += [
     'MediaManager.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'PeerConnection.js',
     'PeerConnection.manifest',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/mobilemessage/src/Makefile.in
+++ b/dom/mobilemessage/src/Makefile.in
@@ -18,18 +18,16 @@ else ifdef MOZ_B2G_RIL
 VPATH += $(srcdir)/gonk
 else
 VPATH += $(srcdir)/fallback
 endif
 
 LIBRARY_NAME     = dom_mobilemessage_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
 # Add VPATH to LOCAL_INCLUDES so we are going to include the correct backend
--- a/dom/mobilemessage/src/moz.build
+++ b/dom/mobilemessage/src/moz.build
@@ -73,8 +73,11 @@ if CONFIG['MOZ_B2G_RIL']:
     ]
 
 IPDL_SOURCES += [
     'ipc/PMobileMessageCursor.ipdl',
     'ipc/PSms.ipdl',
     'ipc/PSmsRequest.ipdl',
     'ipc/SmsTypes.ipdlh',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/network/src/Makefile.in
+++ b/dom/network/src/Makefile.in
@@ -6,19 +6,16 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = $(srcdir)
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_network_s
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
-
 ifdef MOZ_B2G_RIL
 endif
 
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
--- a/dom/network/src/moz.build
+++ b/dom/network/src/moz.build
@@ -42,8 +42,11 @@ if CONFIG['MOZ_B2G_RIL']:
         'NetworkStatsManager.js',
         'NetworkStatsManager.manifest',
     ]
 
 IPDL_SOURCES += [
     'PTCPServerSocket.ipdl',
     'PTCPSocket.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/plugins/base/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@@ -12,21 +12,16 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkplugin
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 LOCAL_INCLUDES += -I$(topsrcdir)/dom/plugins/base/android
-else
-# 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 := 1
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 	LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
 endif
 
 LOCAL_INCLUDES += \
   -DSK_BUILD_FOR_ANDROID_NDK \
--- a/dom/plugins/base/android/Makefile.in
+++ b/dom/plugins/base/android/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkpluginandroid_s
 LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/widget/android \
   -I$(topsrcdir)/widget/xpwidgets \
   -I$(topsrcdir)/dom/plugins/base \
   -I$(topsrcdir)/dom/plugins/base/android/include \
   -I$(topsrcdir)/gfx/gl \
   $(MOZ_CAIRO_CFLAGS) \
   $(MOZ_PIXMAN_CFLAGS) \
--- a/dom/plugins/base/android/moz.build
+++ b/dom/plugins/base/android/moz.build
@@ -20,8 +20,10 @@ CPP_SOURCES += [
     'ANPNativeWindow.cpp',
     'ANPOpenGL.cpp',
     'ANPSurface.cpp',
     'ANPSystem.cpp',
     'ANPVideo.cpp',
     'ANPWindow.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -83,8 +83,14 @@ else:
     elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
         CPP_SOURCES += [
             'nsPluginNativeWindowQt.cpp',
         ]
     else:
         CPP_SOURCES += [
             'nsPluginNativeWindow.cpp',
         ]
+
+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
--- a/dom/plugins/ipc/Makefile.in
+++ b/dom/plugins/ipc/Makefile.in
@@ -4,18 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FAIL_ON_WARNINGS := 1
-
 LIBRARY_NAME     = domplugins_s
 LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 
 ifeq (WINNT,$(OS_ARCH))
 DEFINES += \
   -DMOZ_HANGUI_PROCESS_NAME=\"plugin-hang-ui$(BIN_SUFFIX)\" \
   $(NULL)
--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@@ -97,8 +97,11 @@ IPDL_SOURCES += [
     'PPluginIdentifier.ipdl',
     'PPluginInstance.ipdl',
     'PPluginModule.ipdl',
     'PPluginScriptableObject.ipdl',
     'PPluginStream.ipdl',
     'PPluginSurface.ipdl',
     'PStreamNotify.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/plugins/test/testplugin/Makefile.in
+++ b/dom/plugins/test/testplugin/Makefile.in
@@ -6,15 +6,12 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME  = TestPlugin
-ifndef _MSC_VER
-FAIL_ON_WARNINGS = 1
-endif # !_MSC_VER
 
 RELATIVE_PATH=.
 COCOA_NAME=Test
 include @srcdir@/testplugin.mk
--- a/dom/plugins/test/testplugin/moz.build
+++ b/dom/plugins/test/testplugin/moz.build
@@ -6,8 +6,9 @@
 
 DIRS += ['secondplugin']
 
 MODULE = 'nptest'
 NO_DIST_INSTALL = True
 
 LIBRARY_NAME = 'nptest'
 
+FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
--- a/dom/power/Makefile.in
+++ b/dom/power/Makefile.in
@@ -6,14 +6,12 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_power_s
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/power/moz.build
+++ b/dom/power/moz.build
@@ -22,8 +22,10 @@ EXPORTS.mozilla.dom.power += [
 ]
 
 CPP_SOURCES += [
     'PowerManager.cpp',
     'PowerManagerService.cpp',
     'WakeLock.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/promise/Makefile.in
+++ b/dom/promise/Makefile.in
@@ -6,16 +6,14 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dompromise_s
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/workers \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/promise/moz.build
+++ b/dom/promise/moz.build
@@ -15,8 +15,11 @@ EXPORTS.mozilla.dom += [
     'PromiseResolver.h',
 ]
 
 CPP_SOURCES += [
     'Promise.cpp',
     'PromiseResolver.cpp',
     'PromiseCallback.cpp',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/quota/Makefile.in
+++ b/dom/quota/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domquota_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/caps/include \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/quota/moz.build
+++ b/dom/quota/moz.build
@@ -34,8 +34,10 @@ EXPORTS.mozilla.dom.quota += [
 
 CPP_SOURCES += [
     'CheckQuotaHelper.cpp',
     'FileStreams.cpp',
     'QuotaManager.cpp',
     'QuotaObject.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/src/events/Makefile.in
+++ b/dom/src/events/Makefile.in
@@ -2,18 +2,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(topsrcdir)/dom/base
--- a/dom/src/events/moz.build
+++ b/dom/src/events/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'dom'
 
 CPP_SOURCES += [
     'nsJSEventListener.cpp',
 ]
 
 LIBRARY_NAME = 'jsdomevents_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/src/geolocation/Makefile.in
+++ b/dom/src/geolocation/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = jsdomgeolocation_s
 LIBXUL_LIBRARY = 1
 
-FAIL_ON_WARNINGS := 1
-
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/dom/ipc \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)
 
 ifdef MOZ_MAEMO_LIBLOCATION
--- a/dom/src/geolocation/moz.build
+++ b/dom/src/geolocation/moz.build
@@ -11,8 +11,10 @@ EXPORTS += [
     'nsGeoPositionIPCSerialiser.h',
 ]
 
 CPP_SOURCES += [
     'nsGeoPosition.cpp',
     'nsGeolocation.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/src/json/Makefile.in
+++ b/dom/src/json/Makefile.in
@@ -2,18 +2,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/.
 
 DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES = \
 		-I$(srcdir)/../base \
 		-I$(topsrcdir)/content/events/src
 
--- a/dom/src/json/moz.build
+++ b/dom/src/json/moz.build
@@ -13,8 +13,10 @@ EXPORTS += [
 ]
 
 CPP_SOURCES += [
     'nsJSON.cpp',
 ]
 
 LIBRARY_NAME = 'json_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@@ -2,18 +2,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
 
 LOCAL_INCLUDES += \
 		-I$(srcdir) \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/netwerk/base/src \
--- a/dom/src/jsurl/moz.build
+++ b/dom/src/jsurl/moz.build
@@ -13,8 +13,10 @@ EXPORTS += [
 ]
 
 CPP_SOURCES += [
     'nsJSProtocolHandler.cpp',
 ]
 
 LIBRARY_NAME = 'jsurl_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/src/notification/Makefile.in
+++ b/dom/src/notification/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = jsdomnotification_s
 LIBXUL_LIBRARY = 1
 
-FAIL_ON_WARNINGS := 1
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/ipc \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/src/notification/moz.build
+++ b/dom/src/notification/moz.build
@@ -11,8 +11,10 @@ EXPORTS.mozilla.dom += [
     'Notification.h',
 ]
 
 CPP_SOURCES += [
     'DesktopNotification.cpp',
     'Notification.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/src/offline/Makefile.in
+++ b/dom/src/offline/Makefile.in
@@ -6,16 +6,14 @@
 DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/src/offline/moz.build
+++ b/dom/src/offline/moz.build
@@ -10,8 +10,10 @@ EXPORTS += [
     'nsDOMOfflineResourceList.h',
 ]
 CPP_SOURCES += [
     'nsDOMOfflineResourceList.cpp',
 ]
 
 LIBRARY_NAME = 'jsdomoffline_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@@ -2,18 +2,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/.
 
 DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = jsdomstorage_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES = \
                 -I$(topsrcdir)/dom/base \
--- a/dom/src/storage/moz.build
+++ b/dom/src/storage/moz.build
@@ -17,8 +17,11 @@ CPP_SOURCES += [
     'DOMStorageIPC.cpp',
     'DOMStorageManager.cpp',
     'DOMStorageObserver.cpp',
 ]
 
 IPDL_SOURCES += [
     'PStorage.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/system/Makefile.in
+++ b/dom/system/Makefile.in
@@ -6,18 +6,16 @@ DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domsystem_s
 LIBXUL_LIBRARY  = 1
-FAIL_ON_WARNINGS := 1
-
 DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\" -DDLL_SUFFIX=\"$(DLL_SUFFIX)\"
 
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/bindings \
   -I$(topsrcdir)/js/xpconnect/loader \
--- a/dom/system/android/Makefile.in
+++ b/dom/system/android/Makefile.in
@@ -8,17 +8,15 @@ srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domsystemandroid_s
 
 LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
                      -I$(topsrcdir)/content/events/src
                      $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
--- a/dom/system/android/moz.build
+++ b/dom/system/android/moz.build
@@ -6,8 +6,10 @@
 
 MODULE = 'dom'
 
 CPP_SOURCES += [
     'AndroidLocationProvider.cpp',
     'nsHapticFeedback.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/system/gonk/Makefile.in
+++ b/dom/system/gonk/Makefile.in
@@ -18,18 +18,16 @@ srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domsystemgonk_s
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/src/geolocation \
   -I$(topsrcdir)/dom/telephony \
   -I$(topsrcdir)/dom/wifi \
   -I$(topsrcdir)/dom/bluetooth \
--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@@ -75,8 +75,10 @@ EXTRA_COMPONENTS += [
 
 EXTRA_JS_MODULES += [
     'net_worker.js',
     'ril_consts.js',
     'ril_worker.js',
     'systemlibs.js',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/system/mac/Makefile.in
+++ b/dom/system/mac/Makefile.in
@@ -8,15 +8,13 @@ srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domsystemmac_s
 
 LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
                    $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/system/mac/moz.build
+++ b/dom/system/mac/moz.build
@@ -2,8 +2,11 @@
 # 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/.
 
 MODULE = 'dom'
 
 CMMSRCS += ['CoreLocationLocationProvider.mm']
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -44,8 +44,10 @@ CPP_SOURCES += [
 # On Systems that have build in geolocation providers,
 # we really do not need these.
 if CONFIG['OS_TARGET'] != 'Android' or CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     EXTRA_COMPONENTS += [
         'NetworkGeolocationProvider.js',
         'NetworkGeolocationProvider.manifest',
     ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/system/unix/Makefile.in
+++ b/dom/system/unix/Makefile.in
@@ -8,18 +8,16 @@ srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domsystemunix_s
 
 LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
 ifdef MOZ_MAEMO_LIBLOCATION
         LOCAL_INCLUDES  += $(MOZ_PLATFORM_MAEMO_CFLAGS) \
                            -I$(topsrcdir)/dom/src/geolocation \
                            $(NULL)
 endif
 
 ifdef MOZ_PLATFORM_MAEMO
 LOCAL_INCLUDES  += $(MOZ_DBUS_CFLAGS) \
--- a/dom/system/unix/moz.build
+++ b/dom/system/unix/moz.build
@@ -16,8 +16,11 @@ if CONFIG['MOZ_PLATFORM_MAEMO']:
         'nsHapticFeedback.cpp',
     ]
 
 if CONFIG['MOZ_ENABLE_QTMOBILITY']:
     CPP_SOURCES += [
         'moc_QTMLocationProvider.cpp',
         'QTMLocationProvider.cpp',
     ]
+
+FAIL_ON_WARNINGS = True
+
--- a/dom/system/windows/Makefile.in
+++ b/dom/system/windows/Makefile.in
@@ -8,14 +8,13 @@ srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domsystemwindows_s
 
 LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
 
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += -I$(topsrcdir)/content/events/src
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/system/windows/moz.build
+++ b/dom/system/windows/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'dom'
 
 CPP_SOURCES += [
     'nsHapticFeedback.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/telephony/Makefile.in
+++ b/dom/telephony/Makefile.in
@@ -6,14 +6,12 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domtelephony_s
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/telephony/moz.build
+++ b/dom/telephony/moz.build
@@ -15,8 +15,10 @@ MODULE = 'dom'
 CPP_SOURCES += [
     'CallEvent.cpp',
     'CallsList.cpp',
     'Telephony.cpp',
     'TelephonyCall.cpp',
     'TelephonyCallGroup.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/time/Makefile.in
+++ b/dom/time/Makefile.in
@@ -6,14 +6,12 @@ DEPTH            = ../..
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_time_s
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/time/moz.build
+++ b/dom/time/moz.build
@@ -21,8 +21,10 @@ EXPORTS.mozilla.dom.time += [
 
 CPP_SOURCES += [
     'DateCacheCleaner.cpp',
     'TimeChangeObserver.cpp',
     'TimeManager.cpp',
     'TimeService.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/voicemail/Makefile.in
+++ b/dom/voicemail/Makefile.in
@@ -6,14 +6,12 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domvoicemail_s
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/voicemail/moz.build
+++ b/dom/voicemail/moz.build
@@ -18,8 +18,10 @@ MODULE = 'dom'
 EXPORTS.mozilla.dom += [
     'Voicemail.h',
 ]
 
 CPP_SOURCES += [
     'Voicemail.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/dom/workers/Makefile.in
+++ b/dom/workers/Makefile.in
@@ -6,18 +6,16 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/system \
   -I$(topsrcdir)/xpcom/build \
   $(NULL)
 
--- a/dom/workers/moz.build
+++ b/dom/workers/moz.build
@@ -52,8 +52,10 @@ CPP_SOURCES += [
     'WorkerScope.cpp',
     'XMLHttpRequest.cpp',
     'XMLHttpRequestEventTarget.cpp',
     'XMLHttpRequestUpload.cpp',
 ]
 
 LIBRARY_NAME = 'domworkers_s'
 
+FAIL_ON_WARNINGS = True
+
deleted file mode 100644
--- a/editor/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH            := @DEPTH@
-topsrcdir        := @top_srcdir@
-srcdir           := @srcdir@
-VPATH            := @srcdir@
-FAIL_ON_WARNINGS := 1
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
-
--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@@ -7,19 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES        += \
 	$(NULL)
 
 _FILES = \
 	$(srcdir)/res/EditorOverride.css \
 	$(srcdir)/res/grabber.gif \
--- a/editor/composer/src/moz.build
+++ b/editor/composer/src/moz.build
@@ -14,8 +14,10 @@ CPP_SOURCES += [
     'nsComposerDocumentCommands.cpp',
     'nsComposerRegistration.cpp',
     'nsEditingSession.cpp',
     'nsEditorSpellCheck.cpp',
 ]
 
 LIBRARY_NAME = 'composer'
 
+FAIL_ON_WARNINGS = True
+
--- a/editor/libeditor/base/Makefile.in
+++ b/editor/libeditor/base/Makefile.in
@@ -6,18 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 
 # Internal header files, needed by other editor sublibs:
 INTERNAL_HDR_DIR = ../internal
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(topsrcdir)/editor/libeditor/text \
--- a/editor/libeditor/base/moz.build
+++ b/editor/libeditor/base/moz.build
@@ -30,8 +30,10 @@ CPP_SOURCES += [
     'nsEditorEventListener.cpp',
     'nsEditorUtils.cpp',
     'nsSelectionState.cpp',
     'nsStyleSheetTxns.cpp',
 ]
 
 LIBRARY_NAME = 'editorbase_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/editor/libeditor/html/Makefile.in
+++ b/editor/libeditor/html/Makefile.in
@@ -2,18 +2,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS = 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES        += -I$(topsrcdir)/editor/libeditor/base \
                    -I$(topsrcdir)/editor/libeditor/text \
--- a/editor/libeditor/html/moz.build
+++ b/editor/libeditor/html/moz.build
@@ -25,8 +25,10 @@ CPP_SOURCES += [
     'nsHTMLObjectResizer.cpp',
     'nsHTMLURIRefObject.cpp',
     'nsTableEditor.cpp',
     'nsWSRunObject.cpp',
 ]
 
 LIBRARY_NAME = 'htmleditor_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/editor/libeditor/text/Makefile.in
+++ b/editor/libeditor/text/Makefile.in
@@ -2,18 +2,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS = 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(topsrcdir)/editor/libeditor/base \
--- a/editor/libeditor/text/moz.build
+++ b/editor/libeditor/text/moz.build
@@ -14,8 +14,10 @@ CPP_SOURCES += [
     'nsPlaintextEditor.cpp',
     'nsTextEditRules.cpp',
     'nsTextEditRulesBidi.cpp',
     'nsTextEditUtils.cpp',
 ]
 
 LIBRARY_NAME = 'texteditor_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/editor/moz.build
+++ b/editor/moz.build
@@ -13,8 +13,11 @@ PARALLEL_DIRS += [
     'composer',
 ]
 
 MODULE = 'editor'
 
 EXTRA_JS_MODULES += [
     'AsyncSpellCheckTestHelper.jsm',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/editor/txmgr/src/Makefile.in
+++ b/editor/txmgr/src/Makefile.in
@@ -2,18 +2,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS = 1
-
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY	= 1
 
 
 include $(topsrcdir)/config/rules.mk
 
--- a/editor/txmgr/src/moz.build
+++ b/editor/txmgr/src/moz.build
@@ -11,8 +11,10 @@ CPP_SOURCES += [
     'nsTransactionList.cpp',
     'nsTransactionManager.cpp',
     'nsTransactionManagerFactory.cpp',
     'nsTransactionStack.cpp',
 ]
 
 LIBRARY_NAME = 'txmgr'
 
+FAIL_ON_WARNINGS = True
+
deleted file mode 100644
--- a/editor/txmgr/tests/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-FAIL_ON_WARNINGS = 1
-
-include $(DEPTH)/config/autoconf.mk
-
-
-include $(topsrcdir)/config/rules.mk
--- a/editor/txmgr/tests/moz.build
+++ b/editor/txmgr/tests/moz.build
@@ -3,8 +3,10 @@
 # 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/.
 
 CPP_UNIT_TESTS += [
     'TestTXMgr.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/editor/txtsvc/src/Makefile.in
+++ b/editor/txtsvc/src/Makefile.in
@@ -2,17 +2,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS = 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
 
 
 include $(topsrcdir)/config/rules.mk
 
--- a/editor/txtsvc/src/moz.build
+++ b/editor/txtsvc/src/moz.build
@@ -8,8 +8,10 @@ MODULE = 'txtsvc'
 
 CPP_SOURCES += [
     'nsFilteredContentIterator.cpp',
     'nsTextServicesDocument.cpp',
 ]
 
 LIBRARY_NAME = 'txtsvc_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/embedding/browser/build/Makefile.in
+++ b/embedding/browser/build/Makefile.in
@@ -7,19 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
-
 SHARED_LIBRARY_LIBS= \
 		../webBrowser/$(LIB_PREFIX)nsWebBrowser_s.$(LIB_SUFFIX) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir)			\
--- a/embedding/browser/build/moz.build
+++ b/embedding/browser/build/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'webbrwsr'
 
 CPP_SOURCES += [
     'nsWebBrowserModule.cpp',
 ]
 
 LIBRARY_NAME = 'webbrwsr'
 
+FAIL_ON_WARNINGS = True
+
--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@@ -6,17 +6,14 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../../content/base/src \
 		-I$(srcdir)/../../../content/svg/content/src \
 		$(NULL)
 		
 include $(topsrcdir)/config/rules.mk
--- a/embedding/browser/webBrowser/moz.build
+++ b/embedding/browser/webBrowser/moz.build
@@ -43,8 +43,10 @@ CPP_SOURCES += [
     'nsDocShellTreeOwner.cpp',
     'nsEmbedStream.cpp',
     'nsWebBrowser.cpp',
     'nsWebBrowserContentPolicy.cpp',
 ]
 
 LIBRARY_NAME = 'nsWebBrowser_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/embedding/components/appstartup/src/Makefile.in
+++ b/embedding/components/appstartup/src/Makefile.in
@@ -6,12 +6,10 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/components/appstartup/src/moz.build
+++ b/embedding/components/appstartup/src/moz.build
@@ -11,8 +11,10 @@ EXPORTS += [
 ]
 
 CPP_SOURCES += [
     'nsAppStartupNotifier.cpp',
 ]
 
 LIBRARY_NAME = 'appstartupnotifier_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@@ -6,18 +6,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 SHARED_LIBRARY_LIBS = \
 	../windowwatcher/src/$(LIB_PREFIX)windowwatcher_s.$(LIB_SUFFIX) \
 	../appstartup/src/$(LIB_PREFIX)appstartupnotifier_s.$(LIB_SUFFIX) \
 	../find/src/$(LIB_PREFIX)find_s.$(LIB_SUFFIX) \
 	../webbrowserpersist/src/$(LIB_PREFIX)webbrowserpersist_s.$(LIB_SUFFIX) \
 	../commandhandler/src/$(LIB_PREFIX)commandhandler_s.$(LIB_SUFFIX) \
 	$(NULL)
 
--- a/embedding/components/build/moz.build
+++ b/embedding/components/build/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'embedcomponents'
 
 CPP_SOURCES += [
     'nsEmbeddingModule.cpp',
 ]
 
 LIBRARY_NAME = 'embedcomponents'
 
+FAIL_ON_WARNINGS = True
+
--- a/embedding/components/commandhandler/src/Makefile.in
+++ b/embedding/components/commandhandler/src/Makefile.in
@@ -6,12 +6,10 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/components/commandhandler/src/moz.build
+++ b/embedding/components/commandhandler/src/moz.build
@@ -11,8 +11,10 @@ CPP_SOURCES += [
     'nsCommandGroup.cpp',
     'nsCommandManager.cpp',
     'nsCommandParams.cpp',
     'nsControllerCommandTable.cpp',
 ]
 
 LIBRARY_NAME = 'commandhandler_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/embedding/components/find/src/Makefile.in
+++ b/embedding/components/find/src/Makefile.in
@@ -6,12 +6,10 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/components/find/src/moz.build
+++ b/embedding/components/find/src/moz.build
@@ -8,8 +8,10 @@ MODULE = 'find'
 
 CPP_SOURCES += [
     'nsFind.cpp',
     'nsWebBrowserFind.cpp',
 ]
 
 LIBRARY_NAME = 'find_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/embedding/components/printingui/src/mac/Makefile.in
+++ b/embedding/components/printingui/src/mac/Makefile.in
@@ -7,17 +7,13 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= ..
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
-
-
 LOCAL_INCLUDES	= \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/components/printingui/src/mac/moz.build
+++ b/embedding/components/printingui/src/mac/moz.build
@@ -11,8 +11,11 @@ CPP_SOURCES += [
     'nsPrintProgressParams.cpp',
 ]
 
 LIBRARY_NAME = 'printingui_s'
 
 CMMSRCS += [
     'nsPrintingPromptServiceX.mm',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/embedding/components/printingui/src/unixshared/Makefile.in
+++ b/embedding/components/printingui/src/unixshared/Makefile.in
@@ -7,12 +7,10 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= ..
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/components/printingui/src/unixshared/moz.build
+++ b/embedding/components/printingui/src/unixshared/moz.build
@@ -9,8 +9,10 @@ MODULE = 'embedcomponents'
 CPP_SOURCES += [
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
     'nsPrintingPromptService.cpp',
 ]
 
 LIBRARY_NAME = 'printingui_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/embedding/components/printingui/src/win/Makefile.in
+++ b/embedding/components/printingui/src/win/Makefile.in
@@ -7,12 +7,10 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= ..
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/components/printingui/src/win/moz.build
+++ b/embedding/components/printingui/src/win/moz.build
@@ -10,8 +10,10 @@ CPP_SOURCES += [
     'nsPrintDialogUtil.cpp',
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
     'nsPrintingPromptService.cpp',
 ]
 
 LIBRARY_NAME = 'printingui_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/embedding/components/webbrowserpersist/src/Makefile.in
+++ b/embedding/components/webbrowserpersist/src/Makefile.in
@@ -6,17 +6,15 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 	-I$(topsrcdir)/content/html/content/src \
 	-I$(topsrcdir)/content/base/src \
 	$(NULL)
 
--- a/embedding/components/webbrowserpersist/src/moz.build
+++ b/embedding/components/webbrowserpersist/src/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'webbrowserpersist'
 
 CPP_SOURCES += [
     'nsWebBrowserPersist.cpp',
 ]
 
 LIBRARY_NAME = 'webbrowserpersist_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/embedding/components/windowwatcher/src/Makefile.in
+++ b/embedding/components/windowwatcher/src/Makefile.in
@@ -6,14 +6,15 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
 
 # For nsJSUtils
-LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \
+LOCAL_INCLUDES += \
+  -I$(topsrcdir)/dom/base \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/embedding/components/windowwatcher/src/moz.build
+++ b/embedding/components/windowwatcher/src/moz.build
@@ -13,8 +13,10 @@ CPP_SOURCES += [
 
 if CONFIG['MOZ_XUL']:
     CPP_SOURCES += [
         'nsDialogParamBlock.cpp',
     ]
 
 LIBRARY_NAME = 'windowwatcher_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/extensions/gio/Makefile.in
+++ b/extensions/gio/Makefile.in
@@ -7,13 +7,11 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 LOCAL_INCLUDES	= $(MOZ_GIO_CFLAGS)
 
 include $(topsrcdir)/config/rules.mk
--- a/extensions/gio/moz.build
+++ b/extensions/gio/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'nkgio'
 
 CPP_SOURCES += [
     'nsGIOProtocolHandler.cpp',
 ]
 
 LIBRARY_NAME = 'nkgio'
 
+FAIL_ON_WARNINGS = True
+
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -8,19 +8,16 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = gl
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY   = 1
-FAIL_ON_WARNINGS = 1
-
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 ifdef MOZ_WEBGL
 DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL)
 endif
 endif
 
 # NOTE: Please keep GL_PROVIDER in sync with moz.build until all variables
 # are moved over.
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -111,8 +111,10 @@ CPP_SOURCES += [
     'GLTextureImage.cpp',
     'SharedSurface.cpp',
     'SharedSurfaceEGL.cpp',
     'SharedSurfaceGL.cpp',
     'SurfaceFactory.cpp',
     'SurfaceStream.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)
 
 ifdef MOZ_WIDGET_GTK
 CXXFLAGS += $(MOZ_PANGO_CFLAGS)
 endif
 
--- a/gfx/src/moz.build
+++ b/gfx/src/moz.build
@@ -52,8 +52,10 @@ CPP_SOURCES += [
     'nsScriptableRegion.cpp',
     'nsThebesFontEnumerator.cpp',
     'nsThebesGfxFactory.cpp',
     'nsTransform2D.cpp',
 ]
 
 LIBRARY_NAME = 'gkgfx'
 
+FAIL_ON_WARNINGS = True
+
--- a/gfx/thebes/Makefile.in
+++ b/gfx/thebes/Makefile.in
@@ -9,20 +9,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= thebes
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 EXPORT_LIBRARY	= 1
 
-ifndef _MSC_VER
-FAIL_ON_WARNINGS = 1
-endif # !_MSC_VER
-
 # gfxSVGGlyphs needs nsDOMParser.h
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/content/base/public \
 	-I$(topsrcdir)/content/xml/document/src \
 	$(NULL)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gtk3 gonk qt))
 DEFINES += -DMOZ_ENABLE_FREETYPE
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -263,8 +263,10 @@ CPP_SOURCES += [
     'nsSurfaceTexture.cpp',
 ]
 
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CMMSRCS += [
         'gfxMacPlatformFontList.mm',
     ]
+
+FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
--- a/hal/Makefile.in
+++ b/hal/Makefile.in
@@ -19,18 +19,16 @@ VPATH       = \
 
 relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = hal_s
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 MOCHITEST_BROWSER_FILES += \
 	tests/browser_alarms.js \
 	$(NULL)
 
 ifdef MOZ_GAMEPAD
 LOCAL_INCLUDES = -I$(topsrcdir)/dom/base
 endif
 
--- a/hal/moz.build
+++ b/hal/moz.build
@@ -144,8 +144,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
     CMMSRCS += [
         'CocoaSensor.mm',
         'smslib.mm',
     ]
 
 IPDL_SOURCES = [
     'sandbox/PHal.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/image/build/Makefile.in
+++ b/image/build/Makefile.in
@@ -7,18 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 LOCAL_INCLUDES	= \
 		-I. \
 		-I$(srcdir)/../src \
 		-I$(srcdir)/../encoders/ico \
 		-I$(srcdir)/../encoders/png \
 		-I$(srcdir)/../encoders/jpeg \
 		-I$(srcdir)/../encoders/bmp \
 		$(NULL)
--- a/image/build/moz.build
+++ b/image/build/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'imglib2'
 
 CPP_SOURCES += [
     'nsImageModule.cpp',
 ]
 
 LIBRARY_NAME = 'imglib2'
 
+FAIL_ON_WARNINGS = True
+
--- a/image/decoders/Makefile.in
+++ b/image/decoders/Makefile.in
@@ -6,18 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY  = 1
-FAIL_ON_WARNINGS = 1
-
 CSRCS   = iccjpeg.c \
           $(NULL)
 
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
 
 # PNG read/write stuff
 DEFINES		+= -DMOZ_PNG_WRITE \
--- a/image/decoders/icon/Makefile.in
+++ b/image/decoders/icon/Makefile.in
@@ -7,18 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 ifdef MOZ_WIDGET_GTK
 PLATFORM = gtk
 endif
 
 ifneq (,$(filter qt,$(MOZ_WIDGET_TOOLKIT)))
 PLATFORM = qt
 endif
 
--- a/image/decoders/icon/android/Makefile.in
+++ b/image/decoders/icon/android/Makefile.in
@@ -6,12 +6,10 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= imgiconandroid_s
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/image/decoders/icon/android/moz.build
+++ b/image/decoders/icon/android/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'imgicon'
 
 CPP_SOURCES += [
     'nsIconChannel.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/image/decoders/icon/gtk/Makefile.in
+++ b/image/decoders/icon/gtk/Makefile.in
@@ -6,18 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY  = 1
-FAIL_ON_WARNINGS = 1
-
 ifdef MOZ_ENABLE_GNOMEUI
 LOCAL_INCLUDES += $(MOZ_GNOMEUI_CFLAGS)
 else
 LOCAL_INCLUDES += $(TK_CFLAGS)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/image/decoders/icon/gtk/moz.build
+++ b/image/decoders/icon/gtk/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'imgicon'
 
 CPP_SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 LIBRARY_NAME = 'imgicongtk_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/image/decoders/icon/mac/Makefile.in
+++ b/image/decoders/icon/mac/Makefile.in
@@ -5,13 +5,9 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
-
-
 include $(topsrcdir)/config/rules.mk
--- a/image/decoders/icon/mac/moz.build
+++ b/image/decoders/icon/mac/moz.build
@@ -6,8 +6,11 @@
 
 MODULE = 'imgicon'
 
 LIBRARY_NAME = 'imgiconmac_s'
 
 CMMSRCS += [
     'nsIconChannelCocoa.mm',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/image/decoders/icon/moz.build
+++ b/image/decoders/icon/moz.build
@@ -13,8 +13,10 @@ MODULE = 'imgicon'
 CPP_SOURCES += [
     'nsIconModule.cpp',
     'nsIconProtocolHandler.cpp',
     'nsIconURI.cpp',
 ]
 
 LIBRARY_NAME = 'imgicon'
 
+FAIL_ON_WARNINGS = True
+
--- a/image/decoders/icon/win/Makefile.in
+++ b/image/decoders/icon/win/Makefile.in
@@ -6,12 +6,10 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/image/decoders/icon/win/moz.build
+++ b/image/decoders/icon/win/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'imgicon'
 
 CPP_SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 LIBRARY_NAME = 'imgiconwin_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/image/decoders/moz.build
+++ b/image/decoders/moz.build
@@ -31,8 +31,10 @@ CPP_SOURCES += [
     'nsICODecoder.cpp',
     'nsIconDecoder.cpp',
     'nsJPEGDecoder.cpp',
     'nsPNGDecoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgdecoders_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/image/encoders/bmp/Makefile.in
+++ b/image/encoders/bmp/Makefile.in
@@ -5,15 +5,13 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
 
 include $(topsrcdir)/config/rules.mk
 
 
--- a/image/encoders/bmp/moz.build
+++ b/image/encoders/bmp/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'imgbmpe'
 
 CPP_SOURCES += [
     'nsBMPEncoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgbmpe_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/image/encoders/ico/Makefile.in
+++ b/image/encoders/ico/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
 
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
 LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/bmp/
 LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/png/
 
 include $(topsrcdir)/config/rules.mk
 
--- a/image/encoders/ico/moz.build
+++ b/image/encoders/ico/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'imgicoe'
 
 CPP_SOURCES += [
     'nsICOEncoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgicoe_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/image/encoders/jpeg/Makefile.in
+++ b/image/encoders/jpeg/Makefile.in
@@ -5,13 +5,11 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 
--- a/image/encoders/jpeg/moz.build
+++ b/image/encoders/jpeg/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'imgjpege'
 
 CPP_SOURCES += [
     'nsJPEGEncoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgjpege_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/image/encoders/png/Makefile.in
+++ b/image/encoders/png/Makefile.in
@@ -5,18 +5,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 DEFINES		+= -DMOZ_PNG_WRITE \
 	-DMOZ_PNG_READ \
 	$(NULL)
 
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
 
 include $(topsrcdir)/config/rules.mk
 
--- a/image/encoders/png/moz.build
+++ b/image/encoders/png/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'imgpnge'
 
 CPP_SOURCES += [
     'nsPNGEncoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgpnge_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/image/src/Makefile.in
+++ b/image/src/Makefile.in
@@ -7,17 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= imglib2_s
 LIBXUL_LIBRARY  = 1
-FAIL_ON_WARNINGS = 1
 
 # We need to instantiate the decoders
 LOCAL_INCLUDES += -I$(topsrcdir)/image/decoders
 
 # For URI-related functionality
 LOCAL_INCLUDES += -I$(topsrcdir)/netwerk/base/src
 
 # Because SVGDocumentWrapper.cpp includes "mozilla/dom/SVGSVGElement.h"
--- a/image/src/moz.build
+++ b/image/src/moz.build
@@ -33,8 +33,10 @@ CPP_SOURCES += [
     'imgFrame.cpp',
     'imgLoader.cpp',
     'imgRequest.cpp',
     'imgRequestProxy.cpp',
     'imgStatusTracker.cpp',
     'imgTools.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/ipc/testshell/Makefile.in
+++ b/ipc/testshell/Makefile.in
@@ -2,18 +2,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/.
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 relativesrcdir = @relativesrcdir@
-FAIL_ON_WARNINGS = 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = ipcshell_s
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 # For xpcshell error messages and nsDependentJSString
 LOCAL_INCLUDES += \
--- a/ipc/testshell/moz.build
+++ b/ipc/testshell/moz.build
@@ -21,8 +21,11 @@ CPP_SOURCES += [
     'TestShellParent.cpp',
     'XPCShellEnvironment.cpp',
 ]
 
 IPDL_SOURCES = [
     'PTestShell.ipdl',
     'PTestShellCommand.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/ipc/unixsocket/Makefile.in
+++ b/ipc/unixsocket/Makefile.in
@@ -7,12 +7,10 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = mozipcunixsocket_s
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/unixsocket/moz.build
+++ b/ipc/unixsocket/moz.build
@@ -9,8 +9,10 @@ MODULE = 'ipc'
 EXPORTS.mozilla.ipc += [
     'UnixSocket.h',
 ]
 
 CPP_SOURCES += [
     'UnixSocket.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/js/ipc/Makefile.in
+++ b/js/ipc/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = jsipc_s
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/js/ipc \
   -I$(topsrcdir)/js/public \
   -I$(topsrcdir)/js/xpconnect/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/js/ipc/moz.build
+++ b/js/ipc/moz.build
@@ -11,8 +11,11 @@ CPP_SOURCES += [
     'JavaScriptParent.cpp',
     'JavaScriptShared.cpp',
 ]
 
 IPDL_SOURCES += [
     'JavaScriptTypes.ipdlh',
     'PJavaScript.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/js/xpconnect/loader/Makefile.in
+++ b/js/xpconnect/loader/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH 		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FAIL_ON_WARNINGS := 1
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES += \
   -I$(srcdir)/../src \
   -I$(srcdir)/../wrappers \
   -I$(topsrcdir)/content/base/src \
   $(NULL)
 
--- a/js/xpconnect/loader/moz.build
+++ b/js/xpconnect/loader/moz.build
@@ -13,8 +13,11 @@ CPP_SOURCES += [
 ]
 
 LIBRARY_NAME = 'jsloader_s'
 
 EXTRA_JS_MODULES += [
     'ISO8601DateUtils.jsm',
     'XPCOMUtils.jsm',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/js/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = xpconnect_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
 LOCAL_INCLUDES = \
 		-I$(srcdir)/../wrappers \
 		-I$(srcdir)/../loader \
 		-I$(topsrcdir)/caps/include \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/base/public \
 		-I$(topsrcdir)/content/events/src \
 		-I$(topsrcdir)/content/html/content/src \
--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -48,8 +48,10 @@ CPP_SOURCES += [
     'XPCWrappedNativeScope.cpp',
     'XPCWrapper.cpp',
     'dom_quickstubs.cpp',
     'nsCxPusher.cpp',
     'nsScriptError.cpp',
     'nsXPConnect.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/js/xpconnect/wrappers/Makefile.in
+++ b/js/xpconnect/wrappers/Makefile.in
@@ -6,17 +6,14 @@ DEPTH 		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
-ifndef _MSC_VER # warning C4661 for FilteringWrapper
-FAIL_ON_WARNINGS := 1
-endif # !_MSC_VER
 
 LOCAL_INCLUDES = \
                 -I$(srcdir)/../src \
                 -I$(srcdir)/../../../dom/base \
 
 include $(topsrcdir)/config/rules.mk
--- a/js/xpconnect/wrappers/moz.build
+++ b/js/xpconnect/wrappers/moz.build
@@ -16,8 +16,10 @@ CPP_SOURCES += [
     'FilteringWrapper.cpp',
     'WaiveXrayWrapper.cpp',
     'WrapperFactory.cpp',
     'XrayWrapper.cpp',
 ]
 
 LIBRARY_NAME = 'xpcwrappers_s'
 
+# warning C4661 for FilteringWrapper
+FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkbase_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES += \
 		-I$(srcdir) \
 		-I$(srcdir)/../style \
 		-I$(srcdir)/../generic \
 		-I$(srcdir)/../forms \
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -94,8 +94,10 @@ CPP_SOURCES += [
     'nsPresContext.cpp',
     'nsPresShell.cpp',
     'nsQuoteList.cpp',
     'nsRefreshDriver.cpp',
     'nsStyleChangeList.cpp',
     'nsStyleSheetService.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -14,19 +14,16 @@ include $(DEPTH)/config/autoconf.mk
 ifeq ($(OS_ARCH),SunOS)
 SHELL := ksh
 endif
 
 LIBRARY_NAME	= gklayout
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
-
 SHARED_LIBRARY_LIBS = \
 	../base/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \
 	../forms/$(LIB_PREFIX)gkforms_s.$(LIB_SUFFIX) \
 	../generic/$(LIB_PREFIX)gkgeneric_s.$(LIB_SUFFIX) \
 	../ipc/$(LIB_PREFIX)gkipc_s.$(LIB_SUFFIX) \
 	../style/$(LIB_PREFIX)gkstyle_s.$(LIB_SUFFIX) \
 	../tables/$(LIB_PREFIX)gktable_s.$(LIB_SUFFIX) \
 	../xul/base/src/$(LIB_PREFIX)gkxulbase_s.$(LIB_SUFFIX) \
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -13,8 +13,10 @@ EXPORTS += [
 ]
 
 CPP_SOURCES += [
     'nsContentDLF.cpp',
     'nsLayoutModule.cpp',
     'nsLayoutStatics.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@@ -7,18 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../base \
 		-I$(srcdir)/../generic \
 		-I$(srcdir)/../xul/base/src \
 		-I$(srcdir)/../../content/base/src \
 		-I$(srcdir)/../../content/html/content/src \
--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@@ -33,8 +33,10 @@ CPP_SOURCES += [
     'nsProgressFrame.cpp',
     'nsRangeFrame.cpp',
     'nsSelectsAreaFrame.cpp',
     'nsTextControlFrame.cpp',
 ]
 
 LIBRARY_NAME = 'gkforms_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -7,19 +7,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkgeneric_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-ifndef _MSC_VER
-FAIL_ON_WARNINGS = 1
-endif # !_MSC_VER
 
 RESOURCES_HTML = \
 		$(srcdir)/folder.png \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -88,8 +88,10 @@ CPP_SOURCES += [
     'nsVideoFrame.cpp',
     'nsViewportFrame.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CMMSRCS += [
         'nsPluginUtilsOSX.mm',
     ]
+
+FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
--- a/layout/inspector/src/Makefile.in
+++ b/layout/inspector/src/Makefile.in
@@ -6,17 +6,15 @@
 DEPTH=@DEPTH@
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 LOCAL_INCLUDES	+= \
 		-I$(srcdir)/../../style \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/xbl/src \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/layout/inspector/src/moz.build
+++ b/layout/inspector/src/moz.build
@@ -24,8 +24,10 @@ CPP_SOURCES += [
 
 if CONFIG['MOZ_XUL']:
     CPP_SOURCES += [
         'inDOMView.cpp',
     ]
 
 LIBRARY_NAME = 'inspector_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/layout/ipc/Makefile.in
+++ b/layout/ipc/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = gkipc_s
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/layout/base \
 		-I$(topsrcdir)/layout/generic \
 		-I$(topsrcdir)/layout/xul/base/src \
--- a/layout/ipc/moz.build
+++ b/layout/ipc/moz.build
@@ -15,8 +15,11 @@ EXPORTS.mozilla.layout += [
 CPP_SOURCES += [
     'RenderFrameChild.cpp',
     'RenderFrameParent.cpp',
 ]
 
 IPDL_SOURCES = [
     'PRenderFrame.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/layout/mathml/Makefile.in
+++ b/layout/mathml/Makefile.in
@@ -8,19 +8,16 @@ DEPTH=@DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = gkmathml_s
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
-
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../style \
 	-I$(srcdir)/../base \
 	-I$(srcdir)/../generic \
 	-I$(srcdir)/../tables \
 	-I$(topsrcdir)/content/base/src \
 	-I$(topsrcdir)/content/mathml/content/src \
 	-I$(srcdir)/../xul/base/src \
--- a/layout/mathml/moz.build
+++ b/layout/mathml/moz.build
@@ -26,8 +26,10 @@ CPP_SOURCES += [
     'nsMathMLmspaceFrame.cpp',
     'nsMathMLmsqrtFrame.cpp',
     'nsMathMLmstyleFrame.cpp',
     'nsMathMLmtableFrame.cpp',
     'nsMathMLmunderoverFrame.cpp',
     'nsMathMLsemanticsFrame.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/layout/printing/Makefile.in
+++ b/layout/printing/Makefile.in
@@ -5,17 +5,15 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
 		-I$(srcdir)/../base \
 		-I$(srcdir)/../../content/base/src \
 		$(NULL)
 
--- a/layout/printing/moz.build
+++ b/layout/printing/moz.build
@@ -19,8 +19,10 @@ CPP_SOURCES += [
     'nsPrintData.cpp',
     'nsPrintEngine.cpp',
     'nsPrintObject.cpp',
     'nsPrintPreviewListener.cpp',
 ]
 
 LIBRARY_NAME = 'gkprinting_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkstyle_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 ifdef GNU_CC
 OS_CFLAGS := $(OS_CFLAGS) -Wshadow
 OS_CXXFLAGS := $(OS_CXXFLAGS) -Wshadow
 endif
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -118,8 +118,10 @@ CPP_SOURCES += [
     'nsStyleCoord.cpp',
     'nsStyleSet.cpp',
     'nsStyleStruct.cpp',
     'nsStyleTransformMatrix.cpp',
     'nsStyleUtil.cpp',
     'nsTransitionManager.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/layout/svg/Makefile.in
+++ b/layout/svg/Makefile.in
@@ -7,19 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gksvgbase_s
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../base \
 		-I$(srcdir)/../generic \
 		-I$(srcdir)/../style \
 		-I$(srcdir)/../xul/base/src \
 		-I$(srcdir)/../../content/svg/content/src \
--- a/layout/svg/moz.build
+++ b/layout/svg/moz.build
@@ -48,8 +48,10 @@ CPP_SOURCES += [
     'nsSVGTextContainerFrame.cpp',
     'nsSVGTextFrame.cpp',
     'nsSVGTextFrame2.cpp',
     'nsSVGTextPathFrame.cpp',
     'nsSVGUseFrame.cpp',
     'nsSVGUtils.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/layout/tables/Makefile.in
+++ b/layout/tables/Makefile.in
@@ -7,18 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES         += -DDEBUG_TABLE_STRATEGY_off
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../base \
 		-I$(srcdir)/../generic \
 		-I$(srcdir)/../style \
--- a/layout/tables/moz.build
+++ b/layout/tables/moz.build
@@ -24,8 +24,10 @@ CPP_SOURCES += [
     'nsTableOuterFrame.cpp',
     'nsTablePainter.cpp',
     'nsTableRowFrame.cpp',
     'nsTableRowGroupFrame.cpp',
 ]
 
 LIBRARY_NAME = 'gktable_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/layout/tools/layout-debug/src/Makefile.in
+++ b/layout/tools/layout-debug/src/Makefile.in
@@ -7,17 +7,14 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
-
 include $(topsrcdir)/config/rules.mk
 
 libs::
 
 clobber::
 				rm -f $(DIST)\lib\library
--- a/layout/tools/layout-debug/src/moz.build
+++ b/layout/tools/layout-debug/src/moz.build
@@ -19,8 +19,10 @@ CPP_SOURCES += [
     'nsDebugFactory.cpp',
     'nsLayoutDebugCLH.cpp',
     'nsLayoutDebuggingTools.cpp',
     'nsRegressionTester.cpp',
 ]
 
 LIBRARY_NAME = 'gkdebug'
 
+FAIL_ON_WARNINGS = True
+
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkxulbase_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../../../base \
 		-I$(srcdir)/../../../../content/base/src \
 		-I$(srcdir)/../../../../content/events/src \
 		-I$(srcdir)/../../../generic \
--- a/layout/xul/base/src/moz.build
+++ b/layout/xul/base/src/moz.build
@@ -48,8 +48,11 @@ if CONFIG['MOZ_XUL']:
         'nsTitleBarFrame.cpp',
         'nsResizerFrame.cpp',
         'nsListBoxBodyFrame.cpp',
         'nsListItemFrame.cpp',
         'nsListBoxLayout.cpp',
         'nsXULLabelFrame.cpp',
         'nsXULPopupManager.cpp',
     ]
+
+FAIL_ON_WARNINGS = True
+
--- a/layout/xul/grid/Makefile.in
+++ b/layout/xul/grid/Makefile.in
@@ -6,18 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY  = 1
-FAIL_ON_WARNINGS = 1
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../generic \
 		-I$(srcdir)/../../style \
 		-I$(srcdir)/../../forms \
 		$(NULL)
 
--- a/layout/xul/grid/moz.build
+++ b/layout/xul/grid/moz.build
@@ -27,8 +27,10 @@ CPP_SOURCES += [
     'nsGridRowGroupLayout.cpp',
     'nsGridRowLayout.cpp',
     'nsGridRowLeafFrame.cpp',
     'nsGridRowLeafLayout.cpp',
 ]
 
 LIBRARY_NAME = 'gkxulgrid_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/layout/xul/tree/Makefile.in
+++ b/layout/xul/tree/Makefile.in
@@ -6,18 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY  = 1
-FAIL_ON_WARNINGS = 1
-
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(topsrcdir)/content/events/src \
 		-I$(topsrcdir)/content/base/src \
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../base \
 		-I$(srcdir)/../../generic \
 		-I$(srcdir)/../../style \
--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -30,8 +30,10 @@ CPP_SOURCES += [
     'nsTreeImageListener.cpp',
     'nsTreeSelection.cpp',
     'nsTreeStyleCache.cpp',
     'nsTreeUtils.cpp',
 ]
 
 LIBRARY_NAME = 'gkxultree_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/media/mtransport/build/Makefile.in
+++ b/media/mtransport/build/Makefile.in
@@ -12,20 +12,16 @@ include $(DEPTH)/config/autoconf.mk
 EXTRA_DEPS += $(srcdir)/../objs.mk
 
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
 
 LIBXUL_LIBRARY=1
 
-ifndef _MSC_VER
-FAIL_ON_WARNINGS = 1
-endif # !_MSC_VER
-
 include $(srcdir)/../objs.mk
 
 
 # Make a copy into the local directory for dual compilation
 export:: $(MTRANSPORT_CPPSRCS)
 	$(INSTALL) $^ .
 
 # for stun.h
--- a/media/mtransport/build/moz.build
+++ b/media/mtransport/build/moz.build
@@ -25,8 +25,9 @@ EXPORTS.mtransport += [
 ]
 
 CPP_SOURCES += [
     '$(MTRANSPORT_LCPPSRCS)',
 ]
 
 LIBRARY_NAME = 'mtransport'
 
+FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
--- a/media/mtransport/test/Makefile.in
+++ b/media/mtransport/test/Makefile.in
@@ -4,18 +4,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FAIL_ON_WARNINGS = 1
-
 DEFINES += \
   -DHAVE_STRDUP -DNR_SOCKET_IS_VOID_PTR -DSCTP_DEBUG -DINET
 
 ifneq ($(OS_TARGET),Android)
 DEFINES += -DINET6
 endif
 
 LIBS = \
--- a/media/mtransport/test/moz.build
+++ b/media/mtransport/test/moz.build
@@ -16,8 +16,11 @@ if CONFIG['OS_TARGET'] != 'WINNT' and CO
         'transport_unittests.cpp',
         'turn_unittest.cpp',
     ]
 
     if CONFIG['MOZ_SCTP']:
         CPP_UNIT_TESTS += [
             'sctp_unittest.cpp',
         ]
+
+FAIL_ON_WARNINGS = True
+
--- a/modules/libjar/Makefile.in
+++ b/modules/libjar/Makefile.in
@@ -9,12 +9,10 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= jar$(VERSION_NUMBER)
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/modules/libjar/moz.build
+++ b/modules/libjar/moz.build
@@ -29,8 +29,10 @@ CPP_SOURCES += [
     'nsJARChannel.cpp',
     'nsJARFactory.cpp',
     'nsJARInputStream.cpp',
     'nsJARProtocolHandler.cpp',
     'nsJARURI.cpp',
     'nsZipArchive.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/mozglue/android/Makefile.in
+++ b/mozglue/android/Makefile.in
@@ -6,18 +6,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 FORCE_STATIC_LIB = 1
 STL_FLAGS=
-FAIL_ON_WARNINGS := 1
-
 DEFINES += \
   -DANDROID_PACKAGE_NAME='"$(ANDROID_PACKAGE_NAME)"' \
   $(NULL)
 
 ifdef MOZ_FOLD_LIBS
 DEFINES += -DMOZ_FOLD_LIBS
 endif
 
--- a/mozglue/android/moz.build
+++ b/mozglue/android/moz.build
@@ -14,8 +14,10 @@ CPP_SOURCES += [
     'APKOpen.cpp',
     'NSSBridge.cpp',
     'SQLiteBridge.cpp',
     'nsGeckoUtils.cpp',
 ]
 
 LIBRARY_NAME = 'android'
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/base/public/Makefile.in
+++ b/netwerk/base/public/Makefile.in
@@ -2,16 +2,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_LIBXUL
--- a/netwerk/base/public/moz.build
+++ b/netwerk/base/public/moz.build
@@ -129,8 +129,10 @@ EXPORTS += [
     'nsChannelProperties.h',
     'nsNetStrings.h',
     'nsNetUtil.h',
     'nsReadLine.h',
     'nsStreamListenerWrapper.h',
     'nsURIHashKey.h',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@@ -9,18 +9,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= neckobase_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY  = 1
-FAIL_ON_WARNINGS := 1
-
 LOCAL_INCLUDES	+= -I$(topsrcdir)/dom/base
 
 ifdef MOZ_PLATFORM_MAEMO
 ifdef MOZ_ENABLE_LIBCONIC
 	LOCAL_INCLUDES += -I$(srcdir)/../../system/maemo
 endif
 ifdef MOZ_ENABLE_QTNETWORK
 	LOCAL_INCLUDES += -I$(srcdir)/../../system/qt
--- a/netwerk/base/src/moz.build
+++ b/netwerk/base/src/moz.build
@@ -105,8 +105,11 @@ if CONFIG['MOZ_PLATFORM_MAEMO']:
     if CONFIG['MOZ_ENABLE_QTNETWORK']:
         CPP_SOURCES += [
             'nsAutodialQt.cpp',
         ]
 
 EXTRA_JS_MODULES += [
     'NetUtil.jsm',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -9,18 +9,16 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = necko
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
 SHARED_LIBRARY_LIBS = \
   ../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \
   ../dns/$(LIB_PREFIX)neckodns_s.$(LIB_SUFFIX) \
   ../socket/$(LIB_PREFIX)neckosocket_s.$(LIB_SUFFIX) \
   ../streamconv/src/$(LIB_PREFIX)nkconv_s.$(LIB_SUFFIX) \
   ../streamconv/converters/$(LIB_PREFIX)nkcnvts_s.$(LIB_SUFFIX) \
   ../mime/$(LIB_PREFIX)nkmime_s.$(LIB_SUFFIX) \
   ../cache/$(LIB_PREFIX)nkcache_s.$(LIB_SUFFIX) \
--- a/netwerk/build/moz.build
+++ b/netwerk/build/moz.build
@@ -9,8 +9,10 @@ MODULE = 'necko'
 EXPORTS += [
     'nsNetCID.h',
 ]
 
 CPP_SOURCES += [
     'nsNetModule.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/cache/Makefile.in
+++ b/netwerk/cache/Makefile.in
@@ -7,16 +7,14 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../base/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/netwerk/cache/moz.build
+++ b/netwerk/cache/moz.build
@@ -39,8 +39,10 @@ CPP_SOURCES += [
     'nsDiskCacheEntry.cpp',
     'nsDiskCacheMap.cpp',
     'nsDiskCacheStreams.cpp',
     'nsMemoryCacheDevice.cpp',
 ]
 
 LIBRARY_NAME = 'nkcache_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/cookie/Makefile.in
+++ b/netwerk/cookie/Makefile.in
@@ -7,18 +7,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # export required interfaces, even if --disable-cookies has been given
-FAIL_ON_WARNINGS := 1
-
 ifdef NECKO_COOKIES
 LIBRARY_NAME     = neckocookie_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
 
 LOCAL_INCLUDES	= \
 		-I$(topsrcdir)/intl/uconv/src \
 		$(NULL)
--- a/netwerk/cookie/moz.build
+++ b/netwerk/cookie/moz.build
@@ -34,8 +34,11 @@ if CONFIG['NECKO_COOKIES']:
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 if CONFIG['NECKO_COOKIES'] and CONFIG['OS_ARCH'] != 'Darwin':
     XPCSHELL_TESTS_MANIFESTS += ['test/unit_ipc/xpcshell.ini']
 
 IPDL_SOURCES = [
     'PCookieService.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/dns/Makefile.in
+++ b/netwerk/dns/Makefile.in
@@ -7,17 +7,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
 
 # need to include etld_data.inc
 LOCAL_INCLUDES = \
   -I$(srcdir)/../base/src \
   -I. \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@@ -32,8 +32,10 @@ CPP_SOURCES += [
     'nsDNSService2.cpp',
     'nsEffectiveTLDService.cpp',
     'nsHostResolver.cpp',
     'nsIDNService.cpp',
 ]
 
 LIBRARY_NAME = 'neckodns_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/ipc/Makefile.in
+++ b/netwerk/ipc/Makefile.in
@@ -1,18 +1,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/.
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = neckoipc_s
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES +=                  \
   -I$(srcdir)/../protocol/http \
   -I$(srcdir)/../base/src          \
--- a/netwerk/ipc/moz.build
+++ b/netwerk/ipc/moz.build
@@ -31,8 +31,11 @@ CPP_SOURCES += [
     'RemoteOpenFileParent.cpp',
 ]
 
 IPDL_SOURCES = [
     'NeckoChannelParams.ipdlh',
     'PNecko.ipdl',
     'PRemoteOpenFile.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/mime/Makefile.in
+++ b/netwerk/mime/Makefile.in
@@ -2,18 +2,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/.
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
 
 include $(topsrcdir)/config/rules.mk
 
--- a/netwerk/mime/moz.build
+++ b/netwerk/mime/moz.build
@@ -17,8 +17,10 @@ EXPORTS += [
 ]
 
 CPP_SOURCES += [
     'nsMIMEHeaderParamImpl.cpp',
 ]
 
 LIBRARY_NAME = 'nkmime_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/protocol/about/Makefile.in
+++ b/netwerk/protocol/about/Makefile.in
@@ -2,18 +2,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/.
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkabout_s
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
--- a/netwerk/protocol/about/moz.build
+++ b/netwerk/protocol/about/moz.build
@@ -19,8 +19,10 @@ EXPORTS += [
 CPP_SOURCES += [
     'nsAboutBlank.cpp',
     'nsAboutBloat.cpp',
     'nsAboutCache.cpp',
     'nsAboutCacheEntry.cpp',
     'nsAboutProtocolHandler.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/protocol/data/Makefile.in
+++ b/netwerk/protocol/data/Makefile.in
@@ -2,18 +2,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/.
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-FAIL_ON_WARNINGS = 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
 
--- a/netwerk/protocol/data/moz.build
+++ b/netwerk/protocol/data/moz.build
@@ -8,8 +8,10 @@ MODULE = 'necko'
 
 CPP_SOURCES += [
     'nsDataChannel.cpp',
     'nsDataHandler.cpp',
 ]
 
 LIBRARY_NAME = 'nkdata_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/protocol/device/Makefile.in
+++ b/netwerk/protocol/device/Makefile.in
@@ -1,18 +1,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/.
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-FAIL_ON_WARNINGS = 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = nkdevice_s
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES = -I$(srcdir)/../../base/src/ \
                  $(NULL)
 
--- a/netwerk/protocol/device/moz.build
+++ b/netwerk/protocol/device/moz.build
@@ -15,8 +15,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
         'CameraStreamImpl.cpp',
     ]
 
 CPP_SOURCES += [
     'nsDeviceChannel.cpp',
     'nsDeviceProtocolHandler.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/protocol/file/Makefile.in
+++ b/netwerk/protocol/file/Makefile.in
@@ -2,18 +2,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/.
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-FAIL_ON_WARNINGS = 1
-
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/xpcom/ds \
--- a/netwerk/protocol/file/moz.build
+++ b/netwerk/protocol/file/moz.build
@@ -15,8 +15,10 @@ MODULE = 'necko'
 
 CPP_SOURCES += [
     'nsFileChannel.cpp',
     'nsFileProtocolHandler.cpp',
 ]
 
 LIBRARY_NAME = 'nkfile_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/protocol/ftp/Makefile.in
+++ b/netwerk/protocol/ftp/Makefile.in
@@ -2,18 +2,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/.
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-FAIL_ON_WARNINGS = 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkftp_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
--- a/netwerk/protocol/ftp/moz.build
+++ b/netwerk/protocol/ftp/moz.build
@@ -28,8 +28,11 @@ CPP_SOURCES += [
     'nsFtpConnectionThread.cpp',
     'nsFtpControlConnection.cpp',
     'nsFtpProtocolHandler.cpp',
 ]
 
 IPDL_SOURCES += [
     'PFTPChannel.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/protocol/http/Makefile.in
+++ b/netwerk/protocol/http/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkhttp_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/xpcom/ds \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -74,8 +74,11 @@ CPP_SOURCES += [
 ]
 
 IPDL_SOURCES += [
     'PHttpChannel.ipdl',
 ]
 EXTRA_JS_MODULES += [
     'UserAgentOverrides.jsm',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/protocol/res/Makefile.in
+++ b/netwerk/protocol/res/Makefile.in
@@ -8,17 +8,15 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkres_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/netwerk/base/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
--- a/netwerk/protocol/res/moz.build
+++ b/netwerk/protocol/res/moz.build
@@ -11,8 +11,10 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'necko_res'
 
 MODULE = 'necko'
 
 CPP_SOURCES += [
     'nsResProtocolHandler.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/protocol/viewsource/Makefile.in
+++ b/netwerk/protocol/viewsource/Makefile.in
@@ -2,18 +2,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/.
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-FAIL_ON_WARNINGS = 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
 
--- a/netwerk/protocol/viewsource/moz.build
+++ b/netwerk/protocol/viewsource/moz.build
@@ -14,8 +14,10 @@ MODULE = 'necko'
 
 CPP_SOURCES += [
     'nsViewSourceChannel.cpp',
     'nsViewSourceHandler.cpp',
 ]
 
 LIBRARY_NAME = 'nkviewsource_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/protocol/websocket/Makefile.in
+++ b/netwerk/protocol/websocket/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkwebsocket_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/xpcom/ds \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/websocket/moz.build
+++ b/netwerk/protocol/websocket/moz.build
@@ -25,8 +25,11 @@ CPP_SOURCES += [
     'WebSocketChannel.cpp',
     'WebSocketChannelChild.cpp',
     'WebSocketChannelParent.cpp',
 ]
 
 IPDL_SOURCES += [
     'PWebSocket.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/protocol/wyciwyg/Makefile.in
+++ b/netwerk/protocol/wyciwyg/Makefile.in
@@ -6,17 +6,15 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= nkwyciwyg_s
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@@ -23,8 +23,11 @@ CPP_SOURCES += [
     'nsWyciwyg.cpp',
     'nsWyciwygChannel.cpp',
     'nsWyciwygProtocolHandler.cpp',
 ]
 
 IPDL_SOURCES += [
     'PWyciwygChannel.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/sctp/datachannel/Makefile.in
+++ b/netwerk/sctp/datachannel/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkdatachan_s
 LIBXUL_LIBRARY = 1
 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO
-FAIL_ON_WARNINGS = 1
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/xpcom/ds \
   -I$(srcdir)/../src \
   -I$(DEPTH)/dist/include/mozilla/net \
   -I$(topsrcdir)/media/webrtc/trunk/third_party/libjingle/source \
   -I$(topsrcdir)/media/mtransport \
   $(NULL)
 
--- a/netwerk/sctp/datachannel/moz.build
+++ b/netwerk/sctp/datachannel/moz.build
@@ -12,8 +12,10 @@ EXPORTS.mozilla.net += [
     'DataChannel.h',
     'DataChannelProtocol.h',
 ]
 
 CPP_SOURCES += [
     'DataChannel.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/socket/Makefile.in
+++ b/netwerk/socket/Makefile.in
@@ -2,17 +2,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/.
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
 
 include $(topsrcdir)/config/rules.mk
 
--- a/netwerk/socket/moz.build
+++ b/netwerk/socket/moz.build
@@ -20,8 +20,10 @@ CPP_SOURCES += [
     'nsSOCKSIOLayer.cpp',
     'nsSOCKSSocketProvider.cpp',
     'nsSocketProviderService.cpp',
     'nsUDPSocketProvider.cpp',
 ]
 
 LIBRARY_NAME = 'neckosocket_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/streamconv/converters/Makefile.in
+++ b/netwerk/streamconv/converters/Makefile.in
@@ -7,16 +7,14 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS := 1
-
 LOCAL_INCLUDES =                        \
         -I$(topsrcdir)/netwerk/base/src \
         $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/netwerk/streamconv/converters/moz.build
+++ b/netwerk/streamconv/converters/moz.build
@@ -25,8 +25,10 @@ if CONFIG['NECKO_PROTOCOLS'].find('ftp')
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'cocoa':
     CPP_SOURCES += [
         'nsBinHexDecoder.cpp',
     ]
 
 LIBRARY_NAME = 'nkcnvts_s'
 
+FAIL_ON_WARNINGS = True
+
deleted file mode 100644
--- a/netwerk/streamconv/public/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-FAIL_ON_WARNINGS := 1
-
-include $(DEPTH)/config/autoconf.mk
-
-
-include $(topsrcdir)/config/rules.mk
-
--- a/netwerk/streamconv/public/moz.build
+++ b/netwerk/streamconv/public/moz.build
@@ -17,8 +17,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
     XPIDL_SOURCES += [
         'nsIAppleFileDecoder.idl',
     ]
 
 XPIDL_MODULE = 'necko_strconv'
 
 MODULE = 'necko'
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/streamconv/src/Makefile.in
+++ b/netwerk/streamconv/src/Makefile.in
@@ -8,17 +8,10 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY  = 1
 
-ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-ifeq (x86_64,$(OS_TEST))
-# nsAppleFileDecoder.cpp has warnings I don't understand.
-FAIL_ON_WARNINGS := 1
-endif
-endif
-
 include $(topsrcdir)/config/rules.mk
 
--- a/netwerk/streamconv/src/moz.build
+++ b/netwerk/streamconv/src/moz.build
@@ -1,20 +1,23 @@
 # -*- 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/.
 
 MODULE = 'necko'
 
+FAIL_ON_WARNINGS = True
+
 CPP_SOURCES += [
     'nsStreamConverterService.cpp',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    if CONFIG['OS_TEST'] != 'x86_64':
-        CPP_SOURCES += [
-            'nsAppleFileDecoder.cpp',
-        ]
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' and CONFIG['OS_TEST'] != 'x86_64':
+    # nsAppleFileDecoder.cpp has warnings I don't understand.
+    FAIL_ON_WARNINGS = False
+    CPP_SOURCES += [
+        'nsAppleFileDecoder.cpp',
+    ]
 
 LIBRARY_NAME = 'nkconv_s'
 
--- a/netwerk/streamconv/test/Makefile.in
+++ b/netwerk/streamconv/test/Makefile.in
@@ -2,18 +2,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBS		= \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 		$(XPCOM_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 
--- a/netwerk/streamconv/test/moz.build
+++ b/netwerk/streamconv/test/moz.build
@@ -7,8 +7,11 @@
 MODULE = 'TestStreamConv'
 
 PROGRAM = 'TestStreamConv'
 
 CPP_SOURCES += [
     'Converters.cpp',
     'TestStreamConv.cpp',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/system/android/Makefile.in
+++ b/netwerk/system/android/Makefile.in
@@ -1,18 +1,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += -I$(srcdir)/../../base/src
  
--- a/netwerk/system/android/moz.build
+++ b/netwerk/system/android/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'necko'
 
 CPP_SOURCES += [
     'nsAndroidNetworkLinkService.cpp',
 ]
 
 LIBRARY_NAME = 'neckosystem_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/system/mac/Makefile.in
+++ b/netwerk/system/mac/Makefile.in
@@ -2,16 +2,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/netwerk/system/mac/moz.build
+++ b/netwerk/system/mac/moz.build
@@ -6,8 +6,11 @@
 
 MODULE = 'necko'
 
 LIBRARY_NAME = 'neckosystem_s'
 
 CMMSRCS += [
     'nsNetworkLinkService.mm',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/system/maemo/Makefile.in
+++ b/netwerk/system/maemo/Makefile.in
@@ -1,18 +1,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
 
 OS_INCLUDES += $(GLIB_CFLAGS) $(LIBCONIC_CFLAGS)
 LOCAL_INCLUDES += -I$(srcdir)/../../base/src
--- a/netwerk/system/maemo/moz.build
+++ b/netwerk/system/maemo/moz.build
@@ -8,8 +8,10 @@ MODULE = 'necko'
 
 CPP_SOURCES += [
     'nsMaemoNetworkLinkService.cpp',
     'nsMaemoNetworkManager.cpp',
 ]
 
 LIBRARY_NAME = 'neckosystem_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/system/qt/Makefile.in
+++ b/netwerk/system/qt/Makefile.in
@@ -2,18 +2,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir	 = @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
 
 OS_INCLUDES += $(MOZ_QT_CFLAGS)
 LOCAL_INCLUDES += -I$(srcdir)/../../base/src
--- a/netwerk/system/qt/moz.build
+++ b/netwerk/system/qt/moz.build
@@ -9,8 +9,10 @@ MODULE = 'necko'
 CPP_SOURCES += [
     'moc_nsQtNetworkManager.cpp',
     'nsQtNetworkLinkService.cpp',
     'nsQtNetworkManager.cpp',
 ]
 
 LIBRARY_NAME = 'neckosystem_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/system/win32/Makefile.in
+++ b/netwerk/system/win32/Makefile.in
@@ -2,16 +2,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/netwerk/system/win32/moz.build
+++ b/netwerk/system/win32/moz.build
@@ -8,8 +8,10 @@ MODULE = 'necko'
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     CPP_SOURCES += [
         'nsNotifyAddrListener.cpp',
     ]
 
 LIBRARY_NAME = 'neckosystem_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/test/mochitests/Makefile.in
+++ b/netwerk/test/mochitests/Makefile.in
@@ -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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir	= @relativesrcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 MOCHITEST_FILES = \
   partial_content.sjs \
   test_partially_cached_content.html \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/netwerk/test/mochitests/moz.build
+++ b/netwerk/test/mochitests/moz.build
@@ -1,7 +1,10 @@
 # -*- 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/.
 
 MODULE = 'test_necko'
+
+FAIL_ON_WARNINGS = True
+
--- a/netwerk/wifi/Makefile.in
+++ b/netwerk/wifi/Makefile.in
@@ -6,21 +6,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-ifneq ($(OS_ARCH),Darwin)
-# osx_corewlan.mm has warnings I don't understand.
-FAIL_ON_WARNINGS := 1
-endif
-
 ifeq ($(OS_ARCH),SunOS)
 OS_INCLUDES += $(GLIB_CFLAGS)
 endif
 
 ifdef NECKO_WIFI_DBUS
 OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS)
 endif
 
--- a/netwerk/wifi/moz.build
+++ b/netwerk/wifi/moz.build
@@ -1,14 +1,16 @@
 # -*- 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/.
 
+FAIL_ON_WARNINGS = True
+
 XPIDL_SOURCES += [
     'nsIWifiAccessPoint.idl',
     'nsIWifiListener.idl',
     'nsIWifiMonitor.idl',
 ]
 
 XPIDL_MODULE = 'necko_wifi'
 
@@ -23,16 +25,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
         'nsWifiMonitorGonk.cpp',
     ]
 else:
     CPP_SOURCES += [
         'nsWifiMonitor.cpp',
     ]
 
 if CONFIG['OS_ARCH'] == 'Darwin':
+    # osx_corewlan.mm has warnings I don't understand.
+    FAIL_ON_WARNINGS = False
     CPP_SOURCES += [
         'nsWifiScannerMac.cpp',
     ]
     CMMSRCS += [
         'osx_corewlan.mm',
     ]
 elif CONFIG['OS_ARCH'] == 'WINNT':
     CPP_SOURCES += [
--- a/security/manager/boot/src/Makefile.in
+++ b/security/manager/boot/src/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY	= 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 DEFINES += -D__STDC_CONSTANT_MACROS
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(DIST)/public/nss \
 		$(NULL)
 
--- a/security/manager/boot/src/moz.build
+++ b/security/manager/boot/src/moz.build
@@ -12,8 +12,10 @@ CPP_SOURCES += [
     'nsSecureBrowserUIImpl.cpp',
     'nsSecurityHeaderParser.cpp',
     'nsSecurityWarningDialogs.cpp',
     'nsSiteSecurityService.cpp',
 ]
 
 LIBRARY_NAME = 'pipboot'
 
+FAIL_ON_WARNINGS = True
+
--- a/security/manager/pki/src/Makefile.in
+++ b/security/manager/pki/src/Makefile.in
@@ -8,16 +8,14 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 INCLUDES	+= \
 		-I$(DIST)/public/nss \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/security/manager/pki/src/moz.build
+++ b/security/manager/pki/src/moz.build
@@ -12,8 +12,10 @@ CPP_SOURCES += [
     'nsNSSDialogHelper.cpp',
     'nsNSSDialogs.cpp',
     'nsPKIModule.cpp',
     'nsPKIParamBlock.cpp',
 ]
 
 LIBRARY_NAME = 'pippki'
 
+FAIL_ON_WARNINGS = True
+
--- a/services/crypto/component/Makefile.in
+++ b/services/crypto/component/Makefile.in
@@ -4,15 +4,13 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FAIL_ON_WARNINGS := 1
-
 EXPORT_LIBRARY := 1
 LIBXUL_LIBRARY := 1
 MOZILLA_INTERNAL_API := 1
 
 include $(topsrcdir)/config/rules.mk
--- a/services/crypto/component/moz.build
+++ b/services/crypto/component/moz.build
@@ -15,8 +15,10 @@ XPIDL_MODULE = 'services-crypto-componen
 MODULE = 'services-crypto'
 
 CPP_SOURCES += [
     'nsSyncJPAKE.cpp',
 ]
 
 LIBRARY_NAME = 'services-crypto'
 
+FAIL_ON_WARNINGS = True
+
--- a/toolkit/components/autocomplete/Makefile.in
+++ b/toolkit/components/autocomplete/Makefile.in
@@ -6,11 +6,9 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/autocomplete/moz.build
+++ b/toolkit/components/autocomplete/moz.build
@@ -19,8 +19,10 @@ MODULE = 'autocomplete'
 
 CPP_SOURCES += [
     'nsAutoCompleteController.cpp',
     'nsAutoCompleteSimpleResult.cpp',
 ]
 
 LIBRARY_NAME = 'tkautocomplete'
 
+FAIL_ON_WARNINGS = True
+
--- a/toolkit/components/downloads/Makefile.in
+++ b/toolkit/components/downloads/Makefile.in
@@ -7,17 +7,15 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = download_s
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI
 
 LOCAL_INCLUDES += \
   -I$(srcdir)/../protobuf \
   $(NULL)
--- a/toolkit/components/downloads/moz.build
+++ b/toolkit/components/downloads/moz.build
@@ -30,8 +30,11 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 
 # XXX - Until Suite builds off XULRunner we can't guarantee our implementation
 # of nsIDownloadManagerUI overrides toolkit's.
 if not CONFIG['MOZ_SUITE']:
     EXTRA_COMPONENTS += [
         'nsDownloadManagerUI.js',
         'nsDownloadManagerUI.manifest',
     ]
+
+FAIL_ON_WARNINGS = True
+
--- a/toolkit/components/perf/Makefile.in
+++ b/toolkit/components/perf/Makefile.in
@@ -6,18 +6,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 LOCAL_INCLUDES := \
   -I$(topsrcdir)/js/xpconnect/loader \
   $(NULL)
 
 ifdef ENABLE_TESTS
 MOCHITEST_CHROME_FILES = \
     test_pm.xul \
     $(NULL)
--- a/toolkit/components/perf/moz.build
+++ b/toolkit/components/perf/moz.build
@@ -10,8 +10,11 @@ CPP_SOURCES += [
     'PerfMeasurement.cpp',
 ]
 
 LIBRARY_NAME = 'jsperf'
 
 EXTRA_JS_MODULES += [
     'PerfMeasurement.jsm',
 ]
+
+FAIL_ON_WARNINGS = True
+
deleted file mode 100644
--- a/toolkit/components/places/tests/cpp/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-relativesrcdir = @relativesrcdir@
-FAIL_ON_WARNINGS = 1
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/places/tests/cpp/moz.build
+++ b/toolkit/components/places/tests/cpp/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'test_places'
 
 CPP_UNIT_TESTS += [
     'test_IHistory.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -9,18 +9,16 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 USE_RCS_MK := 1
 include $(topsrcdir)/config/makefiles/rcs.mk
 
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 LIBRARY_NAME = telemetry
 MSVC_ENABLE_PGO := 1
 
 
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/threads
 
 EXTRA_DSO_LDOPTS += \
--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -31,8 +31,11 @@ EXTRA_PP_COMPONENTS += [
     'TelemetryPing.js',
 ]
 
 EXTRA_JS_MODULES += [
     'TelemetryFile.jsm',
     'TelemetryStopwatch.jsm',
     'ThirdPartyCookieProbe.jsm',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/toolkit/components/url-classifier/Makefile.in
+++ b/toolkit/components/url-classifier/Makefile.in
@@ -7,17 +7,15 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../build \
   $(SQLITE_CFLAGS) \
   $(NULL)
 
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/url-classifier/moz.build
+++ b/toolkit/components/url-classifier/moz.build
@@ -42,8 +42,11 @@ EXTRA_PP_COMPONENTS += [
     'nsUrlClassifierListManager.js',
 ]
 
 LIBRARY_NAME = 'urlclassifier_s'
 
 EXTRA_JS_MODULES += [
     'SafeBrowsing.jsm',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/toolkit/identity/Makefile.in
+++ b/toolkit/identity/Makefile.in
@@ -4,14 +4,12 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FAIL_ON_WARNINGS := 1
-
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/identity/moz.build
+++ b/toolkit/identity/moz.build
@@ -26,8 +26,11 @@ EXTRA_JS_MODULES += [
     'IdentityStore.jsm',
     'IdentityUtils.jsm',
     'LogUtils.jsm',
     'MinimalIdentity.jsm',
     'RelyingParty.jsm',
     'Sandbox.jsm',
     'jwcrypto.jsm',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/toolkit/system/gnome/Makefile.in
+++ b/toolkit/system/gnome/Makefile.in
@@ -6,18 +6,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir	  = @srcdir@
 VPATH	  = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 FORCE_SHARED_LIB = 1
 IS_COMPONENT	= 1
-FAIL_ON_WARNINGS = 1
-
 EXTRA_DSO_LDOPTS += \
 		$(XPCOM_GLUE_LDOPTS) \
 		$(XPCOM_FROZEN_LDOPTS) \
 		$(NSPR_LIBS) \
 		$(MOZ_GCONF_LIBS) \
 		$(MOZ_GNOMEVFS_LIBS) \
 		$(GLIB_LIBS) \
 		$(MOZ_GIO_LIBS) \
--- a/toolkit/system/gnome/moz.build
+++ b/toolkit/system/gnome/moz.build
@@ -23,8 +23,10 @@ if CONFIG['MOZ_ENABLE_GNOMEVFS']:
 if CONFIG['MOZ_ENABLE_GIO']:
     CPP_SOURCES += [
         'nsGIOService.cpp',
         'nsGSettingsService.cpp',
     ]
 
 LIBRARY_NAME = 'mozgnome'
 
+FAIL_ON_WARNINGS = True
+
--- a/tools/profiler/Makefile.in
+++ b/tools/profiler/Makefile.in
@@ -20,19 +20,16 @@ LOCAL_INCLUDES += \
   $(NULL)
 
 ifneq (,$(filter armeabi,$(ANDROID_CPU_ARCH)))
 DEFINES += -DARCH_ARMV6
 endif
 
 EXPORT_LIBRARY  = 1
 LIBXUL_LIBRARY  = 1
-ifndef _MSC_VER
-FAIL_ON_WARNINGS = 1
-endif # !_MSC_VER
 
 # Uncomment for better debugging in opt builds
 #MOZ_OPTIMIZE_FLAGS += -O0 -g
 
 ifeq ($(OS_TARGET),Darwin)
 CMMSRCS += \
   shim_mac_dump_syms.mm
 endif
--- a/tools/profiler/moz.build
+++ b/tools/profiler/moz.build
@@ -1,15 +1,18 @@
 # -*- 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/.
 
 if CONFIG['MOZ_ENABLE_PROFILER_SPS']:
+    FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
+
+
     MODULE = 'profiler'
     LIBRARY_NAME = 'profiler'
     XPIDL_SOURCES += [
         'nsIProfileSaveEvent.idl',
         'nsIProfiler.idl',
     ]
     EXPORTS += [
         'GeckoProfilerFunc.h',
--- a/uriloader/base/Makefile.in
+++ b/uriloader/base/Makefile.in
@@ -7,12 +7,10 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY  = 1
-FAIL_ON_WARNINGS = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/uriloader/base/moz.build
+++ b/uriloader/base/moz.build
@@ -25,8 +25,10 @@ EXPORTS += [
 
 CPP_SOURCES += [
     'nsDocLoader.cpp',
     'nsURILoader.cpp',
 ]
 
 LIBRARY_NAME = 'uriloaderbase_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -30,19 +30,16 @@ endif
 endif
 endif
 endif
 
 VPATH		:= $(srcdir) $(srcdir)/$(OSDIR)
 
 LIBRARY_NAME    = exthandler_s
 LIBXUL_LIBRARY  = 1
-FAIL_ON_WARNINGS = 1
-
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 
 CMMSRCS	= nsOSHelperAppService.mm \
 			nsMIMEInfoMac.mm \
 			nsLocalHandlerAppMac.mm \
 			$(NULL)
 endif
 
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@@ -117,8 +117,11 @@ EXTRA_COMPONENTS += [
     'nsHandlerService.manifest',
     'nsWebHandlerApp.js',
     'nsWebHandlerApp.manifest',
 ]
 
 IPDL_SOURCES += [
     'PExternalHelperApp.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/uriloader/prefetch/Makefile.in
+++ b/uriloader/prefetch/Makefile.in
@@ -7,18 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= prefetch_s
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS = 1
-
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
--- a/uriloader/prefetch/moz.build
+++ b/uriloader/prefetch/moz.build
@@ -27,8 +27,11 @@ CPP_SOURCES += [
     'nsOfflineCacheUpdate.cpp',
     'nsOfflineCacheUpdateService.cpp',
     'nsPrefetchService.cpp',
 ]
 
 IPDL_SOURCES += [
     'POfflineCacheUpdate.ipdl',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/view/src/Makefile.in
+++ b/view/src/Makefile.in
@@ -7,17 +7,15 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-FAIL_ON_WARNINGS := 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES  = \
                 -I$(srcdir)/../../content/events/src/ \
                 $(NULL)
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS)
--- a/view/src/moz.build
+++ b/view/src/moz.build
@@ -8,8 +8,10 @@ MODULE = 'view'
 
 CPP_SOURCES += [
     'nsView.cpp',
     'nsViewManager.cpp',
 ]
 
 LIBRARY_NAME = 'gkview_s'
 
+FAIL_ON_WARNINGS = True
+
--- a/webapprt/gtk2/Makefile.in
+++ b/webapprt/gtk2/Makefile.in
@@ -1,18 +1,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/.
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
-FAIL_ON_WARNINGS := 1
-
 include $(DEPTH)/config/autoconf.mk
 
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/toolkit/xre \
   -I$(topsrcdir)/xpcom/base \
   -I$(topsrcdir)/xpcom/build \
   -I$(DEPTH)/build \
   $(NULL)
--- a/webapprt/gtk2/moz.build
+++ b/webapprt/gtk2/moz.build
@@ -4,8 +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/.
 
 PROGRAM = 'webapprt-stub'
 
 CPP_SOURCES += [
     'webapprt.cpp',
 ]
+
+FAIL_ON_WARNINGS = True
+
--- a/widget/android/Makefile.in
+++ b/widget/android/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = widget_android
 EXPORT_LIBRARY  = 1
 LIBXUL_LIBRARY  = 1
-FAIL_ON_WARNINGS := 1
-
 ifdef MOZ_WEBSMS_BACKEND
 DEFINES += -DMOZ_WEBSMS_BACKEND
 endif
 
 NOT_THERE_YET_CPPSRCS = \
 	nsQtKeyUtils.cpp \
 	nsBidiKeyboard.cpp \
 	nsDragService.cpp \
--- a/widget/android/moz.build
+++ b/widget/android/moz.build
@@ -33,8 +33,10 @@ CPP_SOURCES += [
     'nsIdleServiceAndroid.cpp',
     'nsLookAndFeel.cpp',
     'nsPrintOptionsAndroid.cpp',
     'nsScreenManagerAndroid.cpp',
     'nsWidgetFactory.cpp',
     'nsWindow.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+
--- a/widget/gonk/nativewindow/Makefile.in
+++ b/widget/gonk/nativewindow/Makefile.in
@@ -15,13 +15,12 @@ DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = nativewindow
 LIBXUL_LIBRARY   = 1
-FAIL_ON_WARNINGS := 1
 STL_FLAGS=
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/widget/gonk/nativewindow/moz.build
+++ b/widget/gonk/nativewindow/moz.build
@@ -27,8 +27,10 @@ EXPORTS += [
 ]
 
 if CONFIG['MOZ_B2G_CAMERA'] or CONFIG['MOZ_OMX_DECODER']:
     CPP_SOURCES += [
         'GonkNativeWindowICS.cpp',
         'GonkNativeWindowClientICS.cpp',
     ]
 
+FAIL_ON_WARNINGS = True
+
--- a/widget/gtk2/Makefile.in
+++ b/widget/gtk2/Makefile.in
@@ -13,18 +13,16 @@ include $(DEPTH)/config/autoconf.mk
 ifdef MOZ_ENABLE_GTK2
 LIBRARY_NAME	= widget_gtk2
 else
 LIBRARY_NAME	= widget_gtk3
 endif
 
 EXPORT_LIBRARY	= 1
 LIBXUL_LIBRARY = 1
-FAIL_ON_WARNINGS = 1
-
 NATIVE_THEME_SUPPORT = 1
 
 
 
 CSRCS		= \
 		mozcontainer.c \
 		$(NULL)
 
--- a/widget/gtk2/moz.build
+++ b/widget/gtk2/moz.build
@@ -48,8 +48,11 @@ if CONFIG['NS_PRINTING']:
         'nsPSPrinters.cpp',
     ]
 
 if CONFIG['MOZ_X11']:
     CPP_SOURCES += [
         'nsClipboard.cpp',
         'nsDragService.cpp',
     ]
+
+FAIL_ON_WARNINGS = True
+
--- a/widget/tests/Makefile.in
+++ b/widget/tests/Makefile.in
@@ -3,18 +3,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/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
-FAIL_ON_WARNINGS = 1
-
 include $(DEPTH)/config/autoconf.mk
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 
 ifdef NS_ENABLE_TSF
 #Test disabled because it uses the internal string APIs incorrectly (see bug 582863)
 #CPP_UNIT_TESTS += TestWinTSF.cpp  \
 #                  $(NULL)
--- a/widget/tests/moz.build
+++ b/widget/tests/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'test_widget'
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 CPP_UNIT_TESTS += [
     'TestAppShellSteadyState.cpp',
 ]
 
+FAIL_ON_WARNINGS = True
+