mozilla-release: changeset 171755:71cbd5b14aecd782163fbeb0c63b4b73a38ba7a1

--- a/accessible/src/atk/moz.build
+++ b/accessible/src/atk/moz.build
@@ -28,18 +28,16 @@ SOURCES += [
     'nsMaiInterfaceValue.cpp',
     'Platform.cpp',
     'RootAccessibleWrap.cpp',
     'UtilInterface.cpp',
 ]
 
 LIBRARY_NAME = 'accessibility_toolkit_s'
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../base',
     '../generic',
     '../html',
     '../xpcom',
     '../xul',
     '/other-licenses/atk-1.0',
 ]

--- a/accessible/src/base/moz.build
+++ b/accessible/src/base/moz.build
@@ -55,18 +55,16 @@ UNIFIED_SOURCES += [
 
 if a11y_log:
     UNIFIED_SOURCES += [
         'Logging.cpp',
     ]
 
 LIBRARY_NAME = 'accessibility_base_s'
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../../../content/xbl/src',
     '../../../ipc/chromium/src',
     '../../../layout/generic',
     '../../../layout/style',
     '../../../layout/svg',
     '../../../layout/xul/base/src',
     '../../../layout/xul/tree/',

--- a/accessible/src/generic/moz.build
+++ b/accessible/src/generic/moz.build
@@ -22,18 +22,16 @@ UNIFIED_SOURCES += [
     'OuterDocAccessible.cpp',
     'RootAccessible.cpp',
     'TableCellAccessible.cpp',
     'TextLeafAccessible.cpp',
 ]
 
 LIBRARY_NAME = 'accessibility_generic_s'
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../../../layout/generic',
     '../../../layout/xul/base/src',
     '../base',
     '../html',
     '../xpcom',
     '../xul',
 ]

--- a/accessible/src/html/moz.build
+++ b/accessible/src/html/moz.build
@@ -12,18 +12,16 @@ UNIFIED_SOURCES += [
     'HTMLLinkAccessible.cpp',
     'HTMLListAccessible.cpp',
     'HTMLSelectAccessible.cpp',
     'HTMLTableAccessible.cpp',
 ]
 
 LIBRARY_NAME = 'accessibility_html_s'
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../../../layout/generic',
     '../../../layout/tables',
     '../../../layout/xul/base/src',
     '../base',
     '../generic',
     '../xpcom',
 ]

--- a/accessible/src/mac/moz.build
+++ b/accessible/src/mac/moz.build
@@ -23,18 +23,16 @@ UNIFIED_SOURCES += [
     'mozActionElements.mm',
     'mozDocAccessible.mm',
     'mozHTMLAccessible.mm',
     'mozTextAccessible.mm',
     'Platform.mm',
     'RootAccessibleWrap.mm',
 ]
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../base',
     '../generic',
     '../html',
     '../xul',
     '/layout/generic',
     '/layout/xul/base/src',
     '/widget/cocoa',

--- a/accessible/src/other/moz.build
+++ b/accessible/src/other/moz.build
@@ -11,18 +11,16 @@ EXPORTS.mozilla.a11y += [
 
 SOURCES += [
     'AccessibleWrap.cpp',
     'Platform.cpp',
 ]
 
 LIBRARY_NAME = 'accessibility_toolkit_s'
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../base',
     '../generic',
     '../html',
     '../xul',
 ]
 
 FINAL_LIBRARY = 'xul'

--- a/accessible/src/windows/ia2/moz.build
+++ b/accessible/src/windows/ia2/moz.build
@@ -25,18 +25,16 @@ SOURCES += [
     'ia2AccessibleImage.cpp',
     'ia2AccessibleRelation.cpp',
     'ia2AccessibleTable.cpp',
     'ia2AccessibleTableCell.cpp',
     'ia2AccessibleText.cpp',
     'ia2AccessibleValue.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../../base',
     '../../generic',
     '../../html',
     '../../xpcom',
     '../../xul',
     '../msaa',
 ]

--- a/accessible/src/windows/msaa/moz.build
+++ b/accessible/src/windows/msaa/moz.build
@@ -35,18 +35,16 @@ SOURCES += [
 
 if CONFIG['MOZ_XUL']:
     SOURCES += [
         'XULListboxAccessibleWrap.cpp',
         'XULMenuAccessibleWrap.cpp',
         'XULTreeGridAccessibleWrap.cpp',
     ]
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../../../../content/base/src',
     '../../../../content/events/src',
     '../../base',
     '../../generic',
     '../../html',
     '../../xpcom',
     '../../xul',

--- a/accessible/src/windows/sdn/moz.build
+++ b/accessible/src/windows/sdn/moz.build
@@ -5,18 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'sdnAccessible.cpp',
     'sdnDocAccessible.cpp',
     'sdnTextAccessible.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../../base',
     '../../generic',
     '../../html',
     '../../xpcom',
     '../../xul',
     '../msaa',
 ]

--- a/accessible/src/windows/uia/moz.build
+++ b/accessible/src/windows/uia/moz.build
@@ -3,18 +3,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'uiaRawElmProvider.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../../base',
     '../../generic',
     '../../html',
     '../../xpcom',
     '../../xul',
     '../msaa',
 ]

--- a/accessible/src/xpcom/moz.build
+++ b/accessible/src/xpcom/moz.build
@@ -18,18 +18,16 @@ UNIFIED_SOURCES += [
 ]
 
 GENERATED_SOURCES += [
     'xpcAccEvents.cpp',
 ]
 
 LIBRARY_NAME = 'accessibility_xpcom_s'
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../base',
     '../generic',
 ]
 
 if CONFIG['MOZ_ENABLE_GTK']:
     LOCAL_INCLUDES += [
         '../atk',

--- a/accessible/src/xul/moz.build
+++ b/accessible/src/xul/moz.build
@@ -16,18 +16,16 @@ UNIFIED_SOURCES += [
     'XULSliderAccessible.cpp',
     'XULTabAccessible.cpp',
     'XULTreeAccessible.cpp',
     'XULTreeGridAccessible.cpp',
 ]
 
 LIBRARY_NAME = 'accessibility_xul_s'
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../../../layout/generic',
     '../../../layout/xul/base/src',
     '../../../layout/xul/tree//',
     '../base',
     '../generic',
     '../html',
     '../xpcom',

--- a/caps/src/moz.build
+++ b/caps/src/moz.build
@@ -12,18 +12,16 @@ SOURCES += [
     'nsPrincipal.cpp',
     'nsScriptSecurityManager.cpp',
     'nsSecurityManagerFactory.cpp',
     'nsSystemPrincipal.cpp',
 ]
 
 LIBRARY_NAME = 'caps_s'
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../include',
     '/dom/base',
     '/js/xpconnect/src',
 ]

--- a/chrome/src/moz.build
+++ b/chrome/src/moz.build
@@ -10,17 +10,15 @@ EXPORTS.mozilla.chrome += [
 
 SOURCES += [
     'nsChromeProtocolHandler.cpp',
     'nsChromeRegistry.cpp',
     'nsChromeRegistryChrome.cpp',
     'nsChromeRegistryContent.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'chrome_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xpcom_core'

--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -172,18 +172,16 @@ EXTRA_PP_COMPONENTS += [
 ]
 
 EXTRA_JS_MODULES += [
     'CSPUtils.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkconbase_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [

--- a/content/canvas/src/moz.build
+++ b/content/canvas/src/moz.build
@@ -76,18 +76,16 @@ if CONFIG['MOZ_WEBGL']:
     ]
 else:
     UNIFIED_SOURCES += [
         'WebGLContextNotSupported.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkconcvs_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [

--- a/content/events/src/moz.build
+++ b/content/events/src/moz.build
@@ -62,18 +62,16 @@ SOURCES += [
     'Touch.cpp',
 ]
 
 if CONFIG['MOZ_WEBSPEECH']:
     SOURCES += ['SpeechRecognitionError.cpp']
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkconevents_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [

--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -151,18 +151,16 @@ SOURCES += [
     'TextTrackManager.cpp',
     'TimeRanges.cpp',
     'UndoManager.cpp',
     'ValidityState.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkconhtmlcon_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [

--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@@ -22,18 +22,16 @@ SOURCES += [
     'PluginDocument.cpp',
     'VideoDocument.cpp',
 ]
 
 LIBRARY_NAME = 'gkconhtmldoc_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../../content/src',
     '/caps/include',
     '/content/base/src',
     '/content/events/src',
     '/dom/base',

--- a/content/mathml/content/src/moz.build
+++ b/content/mathml/content/src/moz.build
@@ -6,18 +6,16 @@
 
 SOURCES += [
     'nsMathMLElement.cpp',
     'nsMathMLElementFactory.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'gkcontentmathml_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
 ]

--- a/content/media/apple/moz.build
+++ b/content/media/apple/moz.build
@@ -13,11 +13,9 @@ UNIFIED_SOURCES += [
     'AppleDecoder.cpp',
     'AppleMP3Reader.cpp',
 ]
 
 LIBRARY_NAME = 'gkconapplemedia_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'gklayout'

--- a/content/media/directshow/moz.build
+++ b/content/media/directshow/moz.build
@@ -29,17 +29,15 @@ if not CONFIG['MOZ_WEBRTC']:
         'media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseFilter.cpp',
         'media/webrtc/trunk/webrtc/modules/video_capture/windows/BaseInputPin.cpp',
         'media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.cpp',
         'media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp',
     ]]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'gkcondirectshow_s'
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/media/webrtc/trunk/webrtc/modules/video_capture/windows',
 ]

--- a/content/media/encoder/moz.build
+++ b/content/media/encoder/moz.build
@@ -20,11 +20,9 @@ UNIFIED_SOURCES += [
 if CONFIG['MOZ_OPUS']:
     EXPORTS += ['OpusTrackEncoder.h']
     UNIFIED_SOURCES += ['OpusTrackEncoder.cpp']
 
 LIBRARY_NAME = 'gkconencoder_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'gklayout'

--- a/content/media/gstreamer/moz.build
+++ b/content/media/gstreamer/moz.build
@@ -18,16 +18,14 @@ SOURCES += [
     'GStreamerMozVideoBuffer.cpp',
     'GStreamerReader.cpp',
 ]
 
 LIBRARY_NAME = 'gkcongstreamer_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
 ]

--- a/content/media/mediasource/moz.build
+++ b/content/media/mediasource/moz.build
@@ -23,13 +23,11 @@ UNIFIED_SOURCES += [
     'MediaSourceDecoder.cpp',
     'SourceBuffer.cpp',
     'SourceBufferList.cpp',
     'SourceBufferResource.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'gkconmediasource_s'
 
 FINAL_LIBRARY = 'gklayout'

--- a/content/media/moz.build
+++ b/content/media/moz.build
@@ -143,18 +143,16 @@ SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']:
     SOURCES += [
         'AudioNodeEngineNEON.cpp',
     ]
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkconmedia_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [

--- a/content/media/ogg/moz.build
+++ b/content/media/ogg/moz.build
@@ -17,11 +17,9 @@ UNIFIED_SOURCES += [
     'OggReader.cpp',
     'OggWriter.cpp',
 ]
 
 LIBRARY_NAME = 'gkconogg_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'gklayout'

--- a/content/media/omx/moz.build
+++ b/content/media/omx/moz.build
@@ -21,18 +21,16 @@ if 'rtsp' in CONFIG['NECKO_PROTOCOLS']:
         'RtspOmxDecoder.h',
         'RtspOmxReader.h',
     ]
     SOURCES += [
         'RtspOmxDecoder.cpp',
         'RtspOmxReader.cpp',
     ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'gkconomx_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',

--- a/content/media/plugins/moz.build
+++ b/content/media/plugins/moz.build
@@ -16,16 +16,14 @@ SOURCES += [
     'MediaPluginDecoder.cpp',
     'MediaPluginHost.cpp',
     'MediaPluginReader.cpp',
     'MediaResourceServer.cpp',
 ]
 
 LIBRARY_NAME = 'gkconmediaplugins_s'
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
     ]
 
 FINAL_LIBRARY = 'gklayout'

--- a/content/media/raw/moz.build
+++ b/content/media/raw/moz.build
@@ -14,16 +14,14 @@ UNIFIED_SOURCES += [
     'RawDecoder.cpp',
     'RawReader.cpp',
 ]
 
 LIBRARY_NAME = 'gkconraw_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
 ]
 
 FINAL_LIBRARY = 'gklayout'

--- a/content/media/wave/moz.build
+++ b/content/media/wave/moz.build
@@ -13,11 +13,9 @@ UNIFIED_SOURCES += [
     'WaveDecoder.cpp',
     'WaveReader.cpp',
 ]
 
 LIBRARY_NAME = 'gkconwave_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'gklayout'

--- a/content/media/webaudio/blink/moz.build
+++ b/content/media/webaudio/blink/moz.build
@@ -19,18 +19,16 @@ SOURCES += [
     'Reverb.cpp',
     'ReverbAccumulationBuffer.cpp',
     'ReverbConvolver.cpp',
     'ReverbConvolverStage.cpp',
     'ReverbInputBuffer.cpp',
     'ZeroPole.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'gkconwebaudio_blink_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/media/webaudio',
 ]

--- a/content/media/webaudio/moz.build
+++ b/content/media/webaudio/moz.build
@@ -79,15 +79,13 @@ SOURCES += [
     'ScriptProcessorNode.cpp',
     'ThreeDPoint.cpp',
     'WaveShaperNode.cpp',
     'WebAudioUtils.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'gkconwebaudio_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'

--- a/content/media/webm/moz.build
+++ b/content/media/webm/moz.build
@@ -14,11 +14,9 @@ UNIFIED_SOURCES += [
     'WebMDecoder.cpp',
     'WebMReader.cpp',
 ]
 
 LIBRARY_NAME = 'gkconwebm_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'gklayout'

--- a/content/media/webrtc/moz.build
+++ b/content/media/webrtc/moz.build
@@ -34,17 +34,15 @@ if CONFIG['MOZ_WEBRTC']:
 XPIDL_SOURCES += [
     'nsITabSource.idl'
 ]
 
 UNIFIED_SOURCES += [
     'MediaEngineDefault.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'gkconwebrtc_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 if CONFIG['OS_ARCH'] == 'WINNT':
     DEFINES['NOMINMAX'] = True

--- a/content/media/webspeech/recognition/moz.build
+++ b/content/media/webspeech/recognition/moz.build
@@ -33,18 +33,16 @@ UNIFIED_SOURCES += [
     'SpeechRecognition.cpp',
     'SpeechRecognitionAlternative.cpp',
     'SpeechRecognitionResult.cpp',
     'SpeechRecognitionResultList.cpp',
     'SpeechStreamListener.cpp',
     'test/FakeSpeechRecognitionService.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'gkconwebspeechrecognition_s'
 
 LOCAL_INCLUDES += [
     '/dom/base',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')

--- a/content/media/webspeech/synth/moz.build
+++ b/content/media/webspeech/synth/moz.build
@@ -42,18 +42,16 @@ if CONFIG['MOZ_WEBSPEECH']:
 
 IPDL_SOURCES += [
     'ipc/PSpeechSynthesis.ipdl',
     'ipc/PSpeechSynthesisRequest.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'gkconwebspeechsynth_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     'ipc',
 ]

--- a/content/media/webspeech/synth/pico/moz.build
+++ b/content/media/webspeech/synth/pico/moz.build
@@ -5,13 +5,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsPicoService.cpp',
     'PicoModule.cpp'
 ]
 
 LIBRARY_NAME = 'synthpico'
-LIBXUL_LIBRARY = True
 FAIL_ON_WARNINGS = True
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'

--- a/content/media/wmf/moz.build
+++ b/content/media/wmf/moz.build
@@ -19,11 +19,9 @@ SOURCES += [
     'WMFSourceReaderCallback.cpp',
     'WMFUtils.cpp',
 ]
 
 LIBRARY_NAME = 'gkconwmf_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'gklayout'

--- a/content/smil/moz.build
+++ b/content/smil/moz.build
@@ -56,18 +56,16 @@ SOURCES += [
     'SMILBoolType.cpp',
     'SMILEnumType.cpp',
     'SMILIntegerType.cpp',
     'SMILStringType.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'gkconsmil_s'
 
 LOCAL_INCLUDES += [
     '../base/src',
     '../events/src',
     '/layout/style',
 ]

--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@@ -240,18 +240,16 @@ UNIFIED_SOURCES += [
     'SVGUseElement.cpp',
     'SVGViewBoxSMILType.cpp',
     'SVGViewElement.cpp',
     'SVGZoomEvent.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'gkcontentsvg_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',

--- a/content/svg/document/src/moz.build
+++ b/content/svg/document/src/moz.build
@@ -11,18 +11,16 @@ EXPORTS.mozilla.dom += [
 SOURCES += [
     'SVGDocument.cpp',
 ]
 
 LIBRARY_NAME = 'gkconsvgdoc_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',
     '/content/html/document/src',
     '/content/svg/content/src',
     '/content/xml/document/src',
     '/layout/style',
     '/xpcom/ds',

--- a/content/xbl/src/moz.build
+++ b/content/xbl/src/moz.build
@@ -31,18 +31,16 @@ SOURCES += [
     'nsXBLSerialize.cpp',
     'nsXBLService.cpp',
     'nsXBLWindowKeyHandler.cpp',
     'XBLChildrenElement.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkconxbl_s'
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',
     '/content/html/document/src',

--- a/content/xml/content/src/moz.build
+++ b/content/xml/content/src/moz.build
@@ -17,17 +17,15 @@ SOURCES += [
     'ProcessingInstruction.cpp',
     'XMLStylesheetProcessingInstruction.cpp',
 ]
 
 LIBRARY_NAME = 'gkconxmlcon_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
 ]

--- a/content/xml/document/src/moz.build
+++ b/content/xml/document/src/moz.build
@@ -14,18 +14,16 @@ SOURCES += [
     'nsXMLPrettyPrinter.cpp',
     'XMLDocument.cpp',
 ]
 
 LIBRARY_NAME = 'gkconxmldoc_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/caps/include',
     '/content/base/src',
     '/content/events/src',
     '/content/html/document/src',
     '/content/xul/content/src',

--- a/content/xslt/src/base/moz.build
+++ b/content/xslt/src/base/moz.build
@@ -11,18 +11,16 @@ SOURCES += [
     'txNamespaceMap.cpp',
     'txURIUtils.cpp',
 ]
 
 LIBRARY_NAME = 'txbase_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../../public',
     '../xml',
     '../xpath',
     '../xslt',
 ]
 
 FINAL_LIBRARY = 'gklayout'

--- a/content/xslt/src/xml/moz.build
+++ b/content/xslt/src/xml/moz.build
@@ -8,18 +8,16 @@ SOURCES += [
     'txXMLParser.cpp',
     'txXMLUtils.cpp',
 ]
 
 LIBRARY_NAME = 'txxml_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../base',
     '../xpath',
     '../xslt',
     '/content/base/src',
 ]
 
 FINAL_LIBRARY = 'gklayout'

--- a/content/xslt/src/xpath/moz.build
+++ b/content/xslt/src/xpath/moz.build
@@ -48,17 +48,15 @@ SOURCES += [
     'txXPCOMExtensionFunction.cpp',
     'XPathEvaluator.cpp',
 ]
 
 LIBRARY_NAME = 'txxpath_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../base',
     '../xml',
     '../xslt',
 ]
 
 FINAL_LIBRARY = 'gklayout'

--- a/content/xslt/src/xslt/moz.build
+++ b/content/xslt/src/xslt/moz.build
@@ -41,18 +41,16 @@ EXTRA_COMPONENTS += [
     'txEXSLTRegExFunctions.js',
     'txEXSLTRegExFunctions.manifest',
 ]
 
 LIBRARY_NAME = 'txxslt_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 # For nsDependentJSString
 LOCAL_INCLUDES += ["/dom/base"]
 
 LOCAL_INCLUDES += [
     '../base',
     '../xml',
     '../xpath',
     '/content/base/src',

--- a/content/xul/content/src/moz.build
+++ b/content/xul/content/src/moz.build
@@ -1,16 +1,15 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_XUL']:
-    LIBXUL_LIBRARY = True
     MSVC_ENABLE_PGO = True
 
     SOURCES += [
         'nsXULContextMenuBuilder.cpp',
         'nsXULElement.cpp',
         'nsXULPopupListener.cpp',
     ]
     LIBRARY_NAME = 'gkconxulcon_s'

--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@@ -16,18 +16,16 @@ if CONFIG['MOZ_XUL']:
         'nsXULPrototypeDocument.cpp',
         'XULDocument.cpp',
     ]
 
 LIBRARY_NAME = 'gkconxuldoc_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',
     '/content/xbl/src',
     '/content/xml/document/src',
     '/content/xul/content/src',

--- a/content/xul/templates/src/moz.build
+++ b/content/xul/templates/src/moz.build
@@ -30,18 +30,16 @@ SOURCES += [
     'nsXULTemplateResultSetRDF.cpp',
     'nsXULTemplateResultStorage.cpp',
     'nsXULTemplateResultXML.cpp',
     'nsXULTreeBuilder.cpp',
 ]
 
 LIBRARY_NAME = 'gkconxultmpl_s'
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../../content/src',
     '/content/base/src',
     '/dom/base',
     '/layout/xul/tree/',
 ]

--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -59,18 +59,16 @@ SOURCES += [
     'nsDownloadHistory.cpp',
     'nsDSURIContentListener.cpp',
     'nsWebNavigationInfo.cpp',
     'SerializedLoadContext.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'basedocshell_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [

--- a/docshell/build/moz.build
+++ b/docshell/build/moz.build
@@ -9,18 +9,16 @@ EXPORTS += [
 ]
 
 SOURCES += [
     'nsDocShellModule.cpp',
 ]
 
 LIBRARY_NAME = 'docshell'
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../base',
     '../shistory/src/',
     '/uriloader/base',
     '/uriloader/exthandler',
     '/uriloader/prefetch',
     ]

--- a/docshell/shistory/src/moz.build
+++ b/docshell/shistory/src/moz.build
@@ -14,17 +14,15 @@ SOURCES += [
     'nsSHistory.cpp',
     'nsSHTransaction.cpp',
 ]
 
 LIBRARY_NAME = 'shistory_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/docshell/base',
 ]
 
 FINAL_LIBRARY = 'xul'

--- a/dom/activities/src/moz.build
+++ b/dom/activities/src/moz.build
@@ -23,17 +23,15 @@ EXTRA_COMPONENTS += [
 
 EXTRA_JS_MODULES += [
     'ActivitiesService.jsm',
     'ActivitiesServiceFilter.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'dom_activities_s'
 
 LOCAL_INCLUDES += [
     '/dom/base',
 ]
 
 FINAL_LIBRARY = 'gklayout'

--- a/dom/alarm/moz.build
+++ b/dom/alarm/moz.build
@@ -28,15 +28,13 @@ EXTRA_COMPONENTS += [
 
 EXTRA_JS_MODULES += [
     'AlarmDB.jsm',
     'AlarmService.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domalarm_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'

--- a/dom/apps/src/moz.build
+++ b/dom/apps/src/moz.build
@@ -35,18 +35,16 @@ EXTRA_JS_MODULES += [
 EXTRA_PP_JS_MODULES += [
     'AppsUtils.jsm',
     'OperatorApps.jsm',
     'Webapps.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'dom_apps_s'
 
 FINAL_LIBRARY = 'gklayout'
 
 LOCAL_INCLUDES += [
     '/js/xpconnect/wrappers',
 ]

--- a/dom/audiochannel/moz.build
+++ b/dom/audiochannel/moz.build
@@ -22,15 +22,13 @@ EXPORTS += [
 SOURCES += [
     'AudioChannelAgent.cpp',
     'AudioChannelService.cpp',
     'AudioChannelServiceChild.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domaudiochannel_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'

--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -113,18 +113,16 @@ EXTRA_JS_MODULES += [
     'ConsoleAPIStorage.jsm',
     'DOMRequestHelper.jsm',
     'IndexedDBHelper.jsm',
     'ObjectWrapper.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'jsdombase_s'
 
 LOCAL_INCLUDES += [
     '../battery',
     '../bluetooth',
     '../media',

--- a/dom/battery/moz.build
+++ b/dom/battery/moz.build
@@ -12,18 +12,16 @@ EXPORTS.mozilla.dom.battery += [
 ]
 
 SOURCES += [
     'BatteryManager.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'dom_battery_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/events/src',
 ]

--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -28,18 +28,16 @@ EXPORTS.mozilla.dom += [
     'PrimitiveConversions.h',
     'RootedDictionary.h',
     'TypedArray.h',
     'UnionMember.h',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'dombindings_s'
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/canvas/src',
     '/content/events/src',

--- a/dom/bluetooth/moz.build
+++ b/dom/bluetooth/moz.build
@@ -2,17 +2,16 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_B2G_BT']:
     PARALLEL_DIRS += ['interfaces']
 
-    LIBXUL_LIBRARY = True
     LIBRARY_NAME = 'dombluetooth_s'
 
     SOURCES += [
         'BluetoothA2dpManager.cpp',
         'BluetoothAdapter.cpp',
         'BluetoothDevice.cpp',
         'BluetoothHidManager.cpp',
         'BluetoothManager.cpp',

--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@@ -23,18 +23,16 @@ EXTRA_COMPONENTS += [
 
 EXTRA_JS_MODULES += [
     'BrowserElementParent.jsm',
     'BrowserElementPromptService.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'dom_browserelement_s'
 
 LOCAL_INCLUDES += [
     '../bluetooth',
     '/content/html/content/src',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')

--- a/dom/camera/moz.build
+++ b/dom/camera/moz.build
@@ -42,18 +42,16 @@ if CONFIG['MOZ_B2G_CAMERA']:
 else:
     SOURCES += [
         'FallbackCameraControl.cpp',
         'FallbackCameraManager.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domcamera_s'
 
 LOCAL_INCLUDES += [
     '../base',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')

--- a/dom/cellbroadcast/src/moz.build
+++ b/dom/cellbroadcast/src/moz.build
@@ -11,13 +11,11 @@ EXPORTS.mozilla.dom += [
 ]
 
 SOURCES += [
     'CellBroadcast.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'dom_cellbroadcast_s'
 
 FINAL_LIBRARY = 'gklayout'

--- a/dom/devicestorage/moz.build
+++ b/dom/devicestorage/moz.build
@@ -25,18 +25,16 @@ SOURCES += [
 ]
 
 IPDL_SOURCES += [
     'PDeviceStorageRequest.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domdevicestorage_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',

--- a/dom/encoding/moz.build
+++ b/dom/encoding/moz.build
@@ -17,17 +17,15 @@ SOURCES += [
     'EncodingUtils.cpp',
     'FallbackEncoding.cpp',
     'TextDecoder.cpp',
     'TextEncoder.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domencoding_s'
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/intl/locale/src',
 ]

--- a/dom/file/moz.build
+++ b/dom/file/moz.build
@@ -50,17 +50,15 @@ SOURCES += [
     'FileStreamWrappers.cpp',
     'LockedFile.cpp',
     'MemoryStreams.cpp',
     'MetadataHelper.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domfile_s'
 
 LOCAL_INCLUDES += [
     '../base',
 ]
 
 FINAL_LIBRARY = 'gklayout'

--- a/dom/fmradio/ipc/moz.build
+++ b/dom/fmradio/ipc/moz.build
@@ -15,17 +15,16 @@ SOURCES += [
     'FMRadioChild.cpp',
     'FMRadioParent.cpp',
     'FMRadioRequestChild.cpp',
     'FMRadioRequestParent.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
 LIBRARY_NAME   = 'domfmradio_s'
 
 LOCAL_INCLUDES += [
     '/dom/base',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')

--- a/dom/fmradio/moz.build
+++ b/dom/fmradio/moz.build
@@ -15,18 +15,16 @@ if CONFIG['MOZ_B2G_FM']:
         'FMRadioService.h',
     ]
 
     SOURCES += [
         'FMRadio.cpp',
         'FMRadioService.cpp',
     ]
 
-    LIBXUL_LIBRARY = True
-
     LIBRARY_NAME = 'domfmradio_s'
 
     FINAL_LIBRARY = 'gklayout'
 
 IPDL_SOURCES += [
     'ipc/PFMRadio.ipdl',
     'ipc/PFMRadioRequest.ipdl',
 ]

--- a/dom/gamepad/moz.build
+++ b/dom/gamepad/moz.build
@@ -13,18 +13,16 @@ EXPORTS.mozilla.dom += [
 SOURCES = [
     'Gamepad.cpp',
     'GamepadButton.cpp',
     'GamepadService.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domgamepad_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/dom/base',
 ]

--- a/dom/icc/src/moz.build
+++ b/dom/icc/src/moz.build
@@ -9,18 +9,16 @@ EXPORTS.mozilla.dom += [
 ]
 
 SOURCES += [
     'IccManager.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'dom_icc_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/events/src',
 ]

--- a/dom/indexedDB/ipc/moz.build
+++ b/dom/indexedDB/ipc/moz.build
@@ -25,18 +25,16 @@ IPDL_SOURCES += [
     'PIndexedDBIndex.ipdl',
     'PIndexedDBObjectStore.ipdl',
     'PIndexedDBRequest.ipdl',
     'PIndexedDBTransaction.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'dom_indexeddb_ipc_s'
 
 MOCHITEST_MANIFESTS += ['mochitest.ini']
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [

--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@@ -57,18 +57,16 @@ SOURCES += [
     'Key.cpp',
     'KeyPath.cpp',
     'OpenDatabaseHelper.cpp',
     'TransactionThreadPool.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'dom_indexeddb_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/caps/include',
     '/content/base/src',

--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -66,18 +66,16 @@ IPDL_SOURCES += [
     'PCrashReporter.ipdl',
     'PDocumentRenderer.ipdl',
     'PMemoryReportRequest.ipdl',
     'PTabContext.ipdlh',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domipc_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../src/base',
     '../src/geolocation',

--- a/dom/media/bridge/moz.build
+++ b/dom/media/bridge/moz.build
@@ -22,11 +22,9 @@ LOCAL_INCLUDES += [
     '/media/webrtc/signaling/src/media-conduit',
     '/media/webrtc/signaling/src/mediapipeline',
     '/media/webrtc/signaling/src/peerconnection',
     '/media/webrtc/signaling/src/sipcc/include',
 ]
 
 LIBRARY_NAME = 'peerconnection'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -45,18 +45,16 @@ if CONFIG['MOZ_B2G']:
         'MediaPermissionGonk.h',
     ]
     SOURCES += [
         'MediaPermissionGonk.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'dom_media_s'
 
 LOCAL_INCLUDES += [
     '../base',
     '../camera',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')

--- a/dom/mobilemessage/src/moz.build
+++ b/dom/mobilemessage/src/moz.build
@@ -64,18 +64,16 @@ IPDL_SOURCES += [
     'ipc/PMobileMessageCursor.ipdl',
     'ipc/PSms.ipdl',
     'ipc/PSmsRequest.ipdl',
     'ipc/SmsTypes.ipdlh',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'dom_mobilemessage_s'
 
 LOCAL_INCLUDES += [
     '/dom/base',
 ]

--- a/dom/network/src/moz.build
+++ b/dom/network/src/moz.build
@@ -62,18 +62,16 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
 IPDL_SOURCES += [
     'PTCPServerSocket.ipdl',
     'PTCPSocket.ipdl',
     'PUDPSocket.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'dom_network_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/events/src',
 ]

--- a/dom/nfc/moz.build
+++ b/dom/nfc/moz.build
@@ -16,11 +16,9 @@ if CONFIG['MOZ_NFC']:
       'nsNfc.js',
       'nsNfc.manifest',
     ]
 
 FAIL_ON_WARNINGS = True
 
 LIBRARY_NAME = 'dom_nfc_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'gklayout'

--- a/dom/plugins/base/android/moz.build
+++ b/dom/plugins/base/android/moz.build
@@ -20,18 +20,16 @@ SOURCES += [
     'ANPSurface.cpp',
     'ANPSystem.cpp',
     'ANPVideo.cpp',
     'ANPWindow.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'gkpluginandroid_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/dom/plugins/base',
     '/dom/plugins/base/android/include',

--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -90,18 +90,16 @@ else:
         ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     # android_npapi.h extends the NPNVariable and NPPVariable enums
     # using #defines, which results in Wswitch warnings in gcc-4.6.
     # Therefore, enable FAIL_ON_WARNINGS only on non-Android platforms.
     FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkplugin'
 
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/dom/base',
     '/gfx/skia/include/config',

--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@@ -107,18 +107,16 @@ IPDL_SOURCES += [
     'PPluginScriptableObject.ipdl',
     'PPluginStream.ipdl',
     'PPluginSurface.ipdl',
     'PStreamNotify.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domplugins_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../base',
     '/xpcom/base/',

--- a/dom/power/moz.build
+++ b/dom/power/moz.build
@@ -27,15 +27,13 @@ EXPORTS.mozilla.dom.power += [
 SOURCES += [
     'PowerManager.cpp',
     'PowerManagerService.cpp',
     'WakeLock.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'dom_power_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'

--- a/dom/promise/moz.build
+++ b/dom/promise/moz.build
@@ -14,18 +14,16 @@ EXPORTS.mozilla.dom += [
 
 SOURCES += [
     'Promise.cpp',
     'PromiseCallback.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'dompromise_s'
 
 LOCAL_INCLUDES += [
     '../base',
     '../workers',
 ]
 
 FINAL_LIBRARY = 'gklayout'

--- a/dom/quota/moz.build
+++ b/dom/quota/moz.build
@@ -35,18 +35,16 @@ SOURCES += [
     'CheckQuotaHelper.cpp',
     'FileStreams.cpp',
     'QuotaManager.cpp',
     'QuotaObject.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'domquota_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [

--- a/dom/src/events/moz.build
+++ b/dom/src/events/moz.build
@@ -7,18 +7,16 @@
 SOURCES += [
     'nsJSEventListener.cpp',
 ]
 
 LIBRARY_NAME = 'jsdomevents_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     "/content/base/src",
     "/dom/base",
 ]
 
 FINAL_LIBRARY = 'gklayout'

--- a/dom/src/geolocation/moz.build
+++ b/dom/src/geolocation/moz.build
@@ -11,18 +11,16 @@ EXPORTS += [
 
 SOURCES += [
     'nsGeolocation.cpp',
     'nsGeoPosition.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'jsdomgeolocation_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',

--- a/dom/src/json/moz.build
+++ b/dom/src/json/moz.build
@@ -13,15 +13,13 @@ EXPORTS += [
 SOURCES += [
     'nsJSON.cpp',
 ]
 
 LIBRARY_NAME = 'json_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '/content/base/src',
 ]
 
 FINAL_LIBRARY = 'gklayout'

--- a/dom/src/jsurl/moz.build
+++ b/dom/src/jsurl/moz.build
@@ -13,16 +13,14 @@ EXPORTS += [
 SOURCES += [
     'nsJSProtocolHandler.cpp',
 ]
 
 LIBRARY_NAME = 'jsurl_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     "/dom/base",
     "/netwerk/base/src",
 ]
 
 FINAL_LIBRARY = 'gklayout'

--- a/dom/src/notification/moz.build
+++ b/dom/src/notification/moz.build
@@ -20,18 +20,16 @@ EXPORTS.mozilla.dom += [
 
 SOURCES += [
     'DesktopNotification.cpp',
     'Notification.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'jsdomnotification_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/events/src',

--- a/dom/src/offline/moz.build
+++ b/dom/src/offline/moz.build
@@ -10,17 +10,15 @@ EXPORTS += [
 SOURCES += [
     'nsDOMOfflineResourceList.cpp',
 ]
 
 LIBRARY_NAME = 'jsdomoffline_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     "/content/base/src",
     "/content/events/src",
     "/dom/base",
 ]
 
 FINAL_LIBRARY = 'gklayout'

--- a/dom/src/storage/moz.build
+++ b/dom/src/storage/moz.build
@@ -18,18 +18,16 @@ SOURCES += [
 ]
 
 IPDL_SOURCES += [
     'PStorage.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'jsdomstorage_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [

--- a/dom/system/android/moz.build
+++ b/dom/system/android/moz.build
@@ -6,18 +6,16 @@
 
 SOURCES += [
     'AndroidLocationProvider.cpp',
     'nsHapticFeedback.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domsystemandroid_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/content/events/src',
     '/dom/src/geolocation',

--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@@ -107,18 +107,16 @@ if CONFIG['MOZ_B2G_BT_BLUEZ']:
     ]
 elif CONFIG['MOZ_B2G_BT_BLUEDROID']:
     LOCAL_INCLUDES += [
         '/dom/bluetooth/bluedroid',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domsystemgonk_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 LOCAL_INCLUDES += [
     '/content/events/src',
     '/dom/base',
     '/dom/bluetooth',

--- a/dom/system/mac/moz.build
+++ b/dom/system/mac/moz.build
@@ -3,18 +3,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += ['CoreLocationLocationProvider.mm']
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domsystemmac_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 LOCAL_INCLUDES += [
     '/dom/src/geolocation',
 ]

--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -43,18 +43,16 @@ SOURCES += [
 if CONFIG['OS_TARGET'] != 'Android' or CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     EXTRA_COMPONENTS += [
         'NetworkGeolocationProvider.js',
         'NetworkGeolocationProvider.manifest',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domsystem_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += [
     '/content/events/src',

--- a/dom/system/unix/moz.build
+++ b/dom/system/unix/moz.build
@@ -13,15 +13,13 @@ if CONFIG['MOZ_ENABLE_QTMOBILITY']:
     ]
 
     LOCAL_INCLUDES += [
         '/dom/src/geolocation',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domsystemunix_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'

--- a/dom/system/windows/moz.build
+++ b/dom/system/windows/moz.build
@@ -10,13 +10,11 @@ SOURCES += [
 
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += [
     '/content/events/src',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domsystemwindows_s'
 
 FINAL_LIBRARY = 'gklayout'

--- a/dom/telephony/moz.build
+++ b/dom/telephony/moz.build
@@ -49,14 +49,12 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
     ]
     EXTRA_COMPONENTS += [
         'gonk/TelephonyProvider.js',
         'gonk/TelephonyProvider.manifest',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domtelephony_s'
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'

--- a/dom/time/moz.build
+++ b/dom/time/moz.build
@@ -21,15 +21,13 @@ SOURCES += [
     'DateCacheCleaner.cpp',
     'TimeChangeObserver.cpp',
     'TimeManager.cpp',
     'TimeService.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'dom_time_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'

--- a/dom/voicemail/moz.build
+++ b/dom/voicemail/moz.build
@@ -17,17 +17,15 @@ EXPORTS.mozilla.dom += [
 ]
 
 SOURCES += [
     'Voicemail.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domvoicemail_s'
 
 LOCAL_INCLUDES += [
     '../base',
 ]
 
 FINAL_LIBRARY = 'gklayout'

--- a/dom/wifi/moz.build
+++ b/dom/wifi/moz.build
@@ -27,13 +27,11 @@ EXTRA_JS_MODULES += [
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     SOURCES = [
         'NetUtils.cpp',
         'WifiProxyService.cpp',
         'WifiUtils.cpp',
     ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'domwifi_s'
 
 FINAL_LIBRARY = 'xul'

--- a/dom/workers/moz.build
+++ b/dom/workers/moz.build
@@ -47,18 +47,16 @@ SOURCES += [
     'XMLHttpRequest.cpp',
     'XMLHttpRequestUpload.cpp',
 ]
 
 LIBRARY_NAME = 'domworkers_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../base',
     '../system',
     '/content/base/src',
     '/content/events/src',
     '/xpcom/build',

--- a/editor/composer/src/moz.build
+++ b/editor/composer/src/moz.build
@@ -14,11 +14,9 @@ UNIFIED_SOURCES += [
     'nsEditingSession.cpp',
     'nsEditorSpellCheck.cpp',
 ]
 
 LIBRARY_NAME = 'composer'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/editor/libeditor/base/moz.build
+++ b/editor/libeditor/base/moz.build
@@ -30,18 +30,16 @@ UNIFIED_SOURCES += [
     'SetDocTitleTxn.cpp',
     'SplitElementTxn.cpp',
 ]
 
 LIBRARY_NAME = 'editorbase_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../text',
     '/content/base/src',
     '/content/events/src',
     '/editor/txmgr/src',
     '/extensions/spellcheck/src',
     '/layout/style',
 ]

--- a/editor/libeditor/html/moz.build
+++ b/editor/libeditor/html/moz.build
@@ -25,18 +25,16 @@ UNIFIED_SOURCES += [
     'TextEditorTest.cpp',
     'TypeInState.cpp',
 ]
 
 LIBRARY_NAME = 'htmleditor_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../base',
     '../text',
     '/content/base/src',
     '/editor/txmgr/src',
     '/layout/generic',
     '/layout/style',
     '/layout/tables',

--- a/editor/libeditor/text/moz.build
+++ b/editor/libeditor/text/moz.build
@@ -14,17 +14,15 @@ UNIFIED_SOURCES += [
     'nsTextEditRulesBidi.cpp',
     'nsTextEditUtils.cpp',
 ]
 
 LIBRARY_NAME = 'texteditor_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../base',
     '/content/base/src',
     '/editor/txmgr/src',
 ]
 
 FINAL_LIBRARY = 'gklayout'

--- a/editor/txmgr/src/moz.build
+++ b/editor/txmgr/src/moz.build
@@ -11,11 +11,9 @@ UNIFIED_SOURCES += [
     'nsTransactionManagerFactory.cpp',
     'nsTransactionStack.cpp',
 ]
 
 LIBRARY_NAME = 'txmgr'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/editor/txtsvc/src/moz.build
+++ b/editor/txtsvc/src/moz.build
@@ -8,11 +8,9 @@ UNIFIED_SOURCES += [
     'nsFilteredContentIterator.cpp',
     'nsTextServicesDocument.cpp',
 ]
 
 LIBRARY_NAME = 'txtsvc_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'gklayout'

--- a/embedding/browser/build/moz.build
+++ b/embedding/browser/build/moz.build
@@ -7,16 +7,14 @@
 SOURCES += [
     'nsWebBrowserModule.cpp',
 ]
 
 LIBRARY_NAME = 'webbrwsr'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../setup',
     '../webBrowser',
 ]

--- a/embedding/browser/webBrowser/moz.build
+++ b/embedding/browser/webBrowser/moz.build
@@ -43,16 +43,14 @@ SOURCES += [
     'nsWebBrowser.cpp',
     'nsWebBrowserContentPolicy.cpp',
 ]
 
 LIBRARY_NAME = 'nsWebBrowser_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'webbrwsr'
 LOCAL_INCLUDES += [
     '../../../content/base/src',
     '../../../content/svg/content/src',
 ]

--- a/embedding/components/appstartup/src/moz.build
+++ b/embedding/components/appstartup/src/moz.build
@@ -11,11 +11,9 @@ EXPORTS += [
 SOURCES += [
     'nsAppStartupNotifier.cpp',
 ]
 
 LIBRARY_NAME = 'appstartupnotifier_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'embedcomponents'

--- a/embedding/components/build/moz.build
+++ b/embedding/components/build/moz.build
@@ -7,18 +7,16 @@
 SOURCES += [
     'nsEmbeddingModule.cpp',
 ]
 
 LIBRARY_NAME = 'embedcomponents'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '../appstartup/src',
     '../commandhandler/src',
     '../find/src',
     '../webbrowserpersist/src',
     '../windowwatcher/src',
 ]

--- a/embedding/components/commandhandler/src/moz.build
+++ b/embedding/components/commandhandler/src/moz.build
@@ -11,11 +11,9 @@ SOURCES += [
     'nsCommandParams.cpp',
     'nsControllerCommandTable.cpp',
 ]
 
 LIBRARY_NAME = 'commandhandler_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'embedcomponents'

--- a/embedding/components/find/src/moz.build
+++ b/embedding/components/find/src/moz.build
@@ -8,11 +8,9 @@ SOURCES += [
     'nsFind.cpp',
     'nsWebBrowserFind.cpp',
 ]
 
 LIBRARY_NAME = 'find_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'embedcomponents'

--- a/embedding/components/printingui/src/mac/moz.build
+++ b/embedding/components/printingui/src/mac/moz.build
@@ -12,11 +12,9 @@ SOURCES += [
 LIBRARY_NAME = 'printingui_s'
 
 SOURCES += [
     'nsPrintingPromptServiceX.mm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'embedcomponents'

--- a/embedding/components/printingui/src/os2/moz.build
+++ b/embedding/components/printingui/src/os2/moz.build
@@ -7,11 +7,9 @@
 SOURCES += [
     'nsPrintingPromptService.cpp',
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
 ]
 
 LIBRARY_NAME = 'printingui_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'embedcomponents'

--- a/embedding/components/printingui/src/unixshared/moz.build
+++ b/embedding/components/printingui/src/unixshared/moz.build
@@ -9,11 +9,9 @@ SOURCES += [
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
 ]
 
 LIBRARY_NAME = 'printingui_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'embedcomponents'

--- a/embedding/components/printingui/src/win/moz.build
+++ b/embedding/components/printingui/src/win/moz.build
@@ -10,11 +10,9 @@ SOURCES += [
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
 ]
 
 LIBRARY_NAME = 'printingui_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'embedcomponents'

--- a/embedding/components/webbrowserpersist/src/moz.build
+++ b/embedding/components/webbrowserpersist/src/moz.build
@@ -7,16 +7,14 @@
 SOURCES += [
     'nsWebBrowserPersist.cpp',
 ]
 
 LIBRARY_NAME = 'webbrowserpersist_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'embedcomponents'
 LOCAL_INCLUDES += [
     '/content/base/src',
     '/content/html/content/src',
 ]

--- a/embedding/components/windowwatcher/src/moz.build
+++ b/embedding/components/windowwatcher/src/moz.build
@@ -13,16 +13,14 @@ if CONFIG['MOZ_XUL']:
     SOURCES += [
         'nsDialogParamBlock.cpp',
     ]
 
 LIBRARY_NAME = 'windowwatcher_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'embedcomponents'
 # For nsJSUtils
 LOCAL_INCLUDES += [
     '/dom/base',
 ]

--- a/extensions/auth/moz.build
+++ b/extensions/auth/moz.build
@@ -18,11 +18,9 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     DEFINES['USE_SSPI'] = True
 else:
     SOURCES += [
         'nsAuthSambaNTLM.cpp',
     ]
 
 LIBRARY_NAME = 'auth'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/extensions/cookie/moz.build
+++ b/extensions/cookie/moz.build
@@ -17,17 +17,15 @@ SOURCES += [
     'nsCookieModule.cpp',
     'nsCookiePermission.cpp',
     'nsCookiePromptService.cpp',
     'nsPermission.cpp',
     'nsPermissionManager.cpp',
     'nsPopupWindowManager.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'cookie'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/extensions/gio/moz.build
+++ b/extensions/gio/moz.build
@@ -7,11 +7,9 @@
 SOURCES += [
     'nsGIOProtocolHandler.cpp',
 ]
 
 LIBRARY_NAME = 'nkgio'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/extensions/permissions/moz.build
+++ b/extensions/permissions/moz.build
@@ -6,11 +6,9 @@
 
 SOURCES += [
     'nsContentBlocker.cpp',
     'nsModuleFactory.cpp',
 ]
 
 LIBRARY_NAME = 'permissions'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/extensions/pref/autoconfig/src/moz.build
+++ b/extensions/pref/autoconfig/src/moz.build
@@ -6,13 +6,11 @@
 
 SOURCES += [
     'nsAutoConfig.cpp',
     'nsConfigFactory.cpp',
     'nsJSConfigTriggers.cpp',
     'nsReadConfig.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'autoconfig'
 
 FINAL_LIBRARY = 'xul'

--- a/extensions/spellcheck/hunspell/src/moz.build
+++ b/extensions/spellcheck/hunspell/src/moz.build
@@ -21,11 +21,9 @@ if not CONFIG['MOZ_NATIVE_HUNSPELL']:
         'hunzip.cpp',
         'phonet.cpp',
         'replist.cpp',
         'suggestmgr.cpp',
     ]
 
 LIBRARY_NAME = 'hunspell_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'spellchecker'

--- a/extensions/spellcheck/src/moz.build
+++ b/extensions/spellcheck/src/moz.build
@@ -12,11 +12,9 @@ SOURCES += [
     'mozPersonalDictionary.cpp',
     'mozSpellChecker.cpp',
     'mozSpellCheckerFactory.cpp',
     'mozSpellI18NManager.cpp',
 ]
 
 LIBRARY_NAME = 'spellchecker'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/extensions/universalchardet/src/base/moz.build
+++ b/extensions/universalchardet/src/base/moz.build
@@ -29,11 +29,9 @@ SOURCES += [
     'nsSBCSGroupProber.cpp',
     'nsSJISProber.cpp',
     'nsUniversalDetector.cpp',
     'nsUTF8Prober.cpp',
 ]
 
 LIBRARY_NAME = 'universalchardet_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'universalchardet'

--- a/extensions/universalchardet/src/xpcom/moz.build
+++ b/extensions/universalchardet/src/xpcom/moz.build
@@ -6,11 +6,9 @@
 
 SOURCES += [
     'nsUdetXPCOMWrapper.cpp',
     'nsUniversalCharDetModule.cpp',
 ]
 
 LIBRARY_NAME = 'universalchardet'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -105,17 +105,15 @@ SOURCES += [
     'SurfaceStream.cpp',
     'TextureGarbageBin.cpp',
     'TextureImageEGL.cpp',
     'VBOArena.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gl'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/gfx/ipc/moz.build
+++ b/gfx/ipc/moz.build
@@ -21,15 +21,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
         'SharedDIBSurface.cpp',
         'SharedDIBWin.cpp',
     ]
 
 SOURCES += [
     'SharedDIB.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'gfxipc_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -290,17 +290,15 @@ IPDL_SOURCES = [
     'ipc/PCompositable.ipdl',
     'ipc/PCompositor.ipdl',
     'ipc/PGrallocBuffer.ipdl',
     'ipc/PImageBridge.ipdl',
     'ipc/PLayer.ipdl',
     'ipc/PLayerTransaction.ipdl',
 ]
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'layers'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'thebes'

--- a/gfx/src/moz.build
+++ b/gfx/src/moz.build
@@ -58,13 +58,11 @@ SOURCES += [
     'nsThebesGfxFactory.cpp',
     'nsTransform2D.cpp',
 ]
 
 LIBRARY_NAME = 'gkgfx'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'

--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -267,17 +267,15 @@ SOURCES += [
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     SOURCES += [
         'gfxMacPlatformFontList.mm',
     ]
 
 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'thebes'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/gfx/ycbcr/moz.build
+++ b/gfx/ycbcr/moz.build
@@ -64,11 +64,9 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFI
         'yuv_row_arm.s',
     ]
     SOURCES += [
         'yuv_convert_arm.cpp',
     ]
 
 LIBRARY_NAME = 'ycbcr'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/hal/moz.build
+++ b/hal/moz.build
@@ -155,15 +155,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
     ]
 
 IPDL_SOURCES = [
     'sandbox/PHal.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'hal_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/image/build/moz.build
+++ b/image/build/moz.build
@@ -7,11 +7,9 @@
 SOURCES += [
     'nsImageModule.cpp',
 ]
 
 LIBRARY_NAME = 'imglib2'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/image/decoders/icon/android/moz.build
+++ b/image/decoders/icon/android/moz.build
@@ -5,15 +5,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'imgiconandroid_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'imgicon'

--- a/image/decoders/icon/gtk/moz.build
+++ b/image/decoders/icon/gtk/moz.build
@@ -7,11 +7,9 @@
 SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 LIBRARY_NAME = 'imgicongtk_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'imgicon'

--- a/image/decoders/icon/mac/moz.build
+++ b/image/decoders/icon/mac/moz.build
@@ -7,11 +7,9 @@
 LIBRARY_NAME = 'imgiconmac_s'
 
 SOURCES += [
     'nsIconChannelCocoa.mm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'imgicon'

--- a/image/decoders/icon/moz.build
+++ b/image/decoders/icon/moz.build
@@ -15,11 +15,9 @@ SOURCES += [
     'nsIconProtocolHandler.cpp',
     'nsIconURI.cpp',
 ]
 
 LIBRARY_NAME = 'imgicon'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/image/decoders/icon/os2/moz.build
+++ b/image/decoders/icon/os2/moz.build
@@ -5,11 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 LIBRARY_NAME = 'imgiconos2_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'imgicon'

--- a/image/decoders/icon/qt/moz.build
+++ b/image/decoders/icon/qt/moz.build
@@ -15,11 +15,9 @@ EXTRA_COMPONENTS += [
 ]
 
 EXTRA_PP_COMPONENTS += [
     'gtkqticonsconverter.js',
 ]
 
 LIBRARY_NAME = 'imgiconqt_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'imgicon'

--- a/image/decoders/icon/win/moz.build
+++ b/image/decoders/icon/win/moz.build
@@ -7,11 +7,9 @@
 SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 LIBRARY_NAME = 'imgiconwin_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'imgicon'

--- a/image/decoders/moz.build
+++ b/image/decoders/moz.build
@@ -32,18 +32,16 @@ SOURCES += [
     'nsJPEGDecoder.cpp',
     'nsPNGDecoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgdecoders_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 SOURCES += [
     'iccjpeg.c',
 ]
 
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += [
     '/image/src',
 ]

--- a/image/encoders/bmp/moz.build
+++ b/image/encoders/bmp/moz.build
@@ -7,15 +7,13 @@
 SOURCES += [
     'nsBMPEncoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgbmpe_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '/image/src',
 ]
 
 FINAL_LIBRARY = 'imglib2'

--- a/image/encoders/ico/moz.build
+++ b/image/encoders/ico/moz.build
@@ -7,18 +7,16 @@
 SOURCES += [
     'nsICOEncoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgicoe_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += [
     '../bmp',
     '../png',
     '/image/src',
 ]
 
 FINAL_LIBRARY = 'imglib2'

--- a/image/encoders/jpeg/moz.build
+++ b/image/encoders/jpeg/moz.build
@@ -7,11 +7,9 @@
 SOURCES += [
     'nsJPEGEncoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgjpege_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'imglib2'

--- a/image/encoders/png/moz.build
+++ b/image/encoders/png/moz.build
@@ -7,15 +7,13 @@
 SOURCES += [
     'nsPNGEncoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgpnge_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '/image/src',
 ]
 
 FINAL_LIBRARY = 'imglib2'

--- a/image/src/moz.build
+++ b/image/src/moz.build
@@ -36,15 +36,13 @@ SOURCES += [
     'ScriptedNotificationObserver.cpp',
     'SurfaceCache.cpp',
     'SVGDocumentWrapper.cpp',
     'VectorImage.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'imglib2_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'imglib2'

--- a/intl/build/moz.build
+++ b/intl/build/moz.build
@@ -5,11 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsI18nModule.cpp',
 ]
 
 LIBRARY_NAME = 'i18n'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/intl/chardet/src/moz.build
+++ b/intl/chardet/src/moz.build
@@ -6,11 +6,9 @@
 
 SOURCES += [
     'nsChardetModule.cpp',
     'nsCyrillicDetector.cpp',
 ]
 
 LIBRARY_NAME = 'chardet'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/intl/hyphenation/src/moz.build
+++ b/intl/hyphenation/src/moz.build
@@ -7,17 +7,15 @@
 SOURCES += [
     'hnjstdio.cpp',
     'nsHyphenationManager.cpp',
     'nsHyphenator.cpp',
 ]
 
 LIBRARY_NAME = 'hyphenation_s'
 
-LIBXUL_LIBRARY = True
-
 SOURCES += [
     'hyphen.c',
 ]
 
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'i18n'

--- a/intl/locale/src/mac/moz.build
+++ b/intl/locale/src/mac/moz.build
@@ -7,11 +7,9 @@
 SOURCES += [
     'nsCollationMacUC.cpp',
     'nsDateTimeFormatMac.cpp',
     'nsMacCharset.cpp',
 ]
 
 LIBRARY_NAME = 'platlocale_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'i18n'

--- a/intl/locale/src/moz.build
+++ b/intl/locale/src/moz.build
@@ -28,13 +28,11 @@ SOURCES += [
 ]
 
 LIBRARY_NAME = 'nslocale_s'
 
 EXTRA_JS_MODULES += [
     'PluralForm.jsm',
 ]
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'i18n'

--- a/intl/locale/src/os2/moz.build
+++ b/intl/locale/src/os2/moz.build
@@ -8,11 +8,9 @@ SOURCES += [
     'nsCollationOS2.cpp',
     'nsDateTimeFormatOS2.cpp',
     'nsOS2Charset.cpp',
     'nsOS2Locale.cpp',
 ]
 
 LIBRARY_NAME = 'platlocale_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'i18n'

--- a/intl/locale/src/unix/moz.build
+++ b/intl/locale/src/unix/moz.build
@@ -16,11 +16,9 @@ if CONFIG['OS_TARGET'] == 'Android':
     ]
 else:
     SOURCES += [
         'nsUNIXCharset.cpp',
     ]
 
 LIBRARY_NAME = 'platlocale_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'i18n'

--- a/intl/locale/src/windows/moz.build
+++ b/intl/locale/src/windows/moz.build
@@ -8,11 +8,9 @@ SOURCES += [
     'nsCollationWin.cpp',
     'nsDateTimeFormatWin.cpp',
     'nsWin32Locale.cpp',
     'nsWinCharset.cpp',
 ]
 
 LIBRARY_NAME = 'platlocale_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'i18n'

--- a/intl/lwbrk/src/moz.build
+++ b/intl/lwbrk/src/moz.build
@@ -28,13 +28,11 @@ else:
     ]
     SOURCES += [
         'rulebrk.c',
     ]
 
 
 LIBRARY_NAME = 'lwbrk_s'
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'i18n'

--- a/intl/strres/src/moz.build
+++ b/intl/strres/src/moz.build
@@ -6,13 +6,11 @@
 
 SOURCES += [
     'nsStringBundle.cpp',
     'nsStringBundleTextOverride.cpp',
 ]
 
 LIBRARY_NAME = 'strres_s'
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'i18n'

--- a/intl/uconv/src/moz.build
+++ b/intl/uconv/src/moz.build
@@ -215,17 +215,15 @@ if CONFIG['OS_ARCH'] == 'OS2':
 
 if CONFIG['INTEL_ARCHITECTURE']:
     SOURCES += [
         'nsUTF8ToUnicodeSSE2.cpp',
     ]
 
 LIBRARY_NAME = 'uconv'
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../util',
 ]
 
 FINAL_LIBRARY = 'xul'

--- a/intl/unicharutil/src/moz.build
+++ b/intl/unicharutil/src/moz.build
@@ -9,11 +9,9 @@ UNIFIED_SOURCES += [
     'nsCategoryImp.cpp',
     'nsEntityConverter.cpp',
     'nsSaveAsCharset.cpp',
     'nsUnicodeNormalizer.cpp',
 ]
 
 LIBRARY_NAME = 'ucharucomp_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'i18n'

--- a/intl/unicharutil/util/internal/moz.build
+++ b/intl/unicharutil/util/internal/moz.build
@@ -5,11 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include('../objs.mozbuild')
 
 UNIFIED_SOURCES += intl_unicharutil_util_cppsrcs
 
 LIBRARY_NAME = 'unicharutil_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@@ -272,15 +272,13 @@ if CONFIG['_MSC_VER']:
     ]
 
 ost = CONFIG['OS_TEST']
 if ost.find('86') == -1 and ost.find('arm') == -1 and ost.find('mips') == -1:
     SOURCES += [
         'src/base/atomicops_internals_mutex.cc',
     ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'chromium_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/ipc/dbus/moz.build
+++ b/ipc/dbus/moz.build
@@ -11,15 +11,13 @@ EXPORTS.mozilla.ipc += [
 ]
 
 SOURCES += [
     'DBusThread.cpp',
     'DBusUtils.cpp',
     'RawDBusConnection.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'mozdbus_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/ipc/glue/moz.build
+++ b/ipc/glue/moz.build
@@ -93,15 +93,13 @@ SOURCES += [
 ]
 
 IPDL_SOURCES = [
     'InputStreamParams.ipdlh',
     'ProtocolTypes.ipdlh',
     'URIParams.ipdlh',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'mozipc_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/ipc/ipdl/moz.build
+++ b/ipc/ipdl/moz.build
@@ -4,15 +4,13 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_IPDL_TESTS']:
     DIRS += ['test']
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'mozipdlgen_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/ipc/ipdl/test/cxx/moz.build
+++ b/ipc/ipdl/test/cxx/moz.build
@@ -116,13 +116,11 @@ IPDL_SOURCES += [
     'PTestStackHooks.ipdl',
     'PTestSyncError.ipdl',
     'PTestSyncHang.ipdl',
     'PTestSyncWakeup.ipdl',
     'PTestSysVShmem.ipdl',
     'PTestUrgency.ipdl',
 ]
 
-LIBXUL_LIBRARY = True
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/ipc/keystore/moz.build
+++ b/ipc/keystore/moz.build
@@ -9,15 +9,13 @@ EXPORTS.mozilla.ipc += [
 ]
 
 SOURCES += [
   'KeyStore.cpp'
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'mozkeystore_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/ipc/netd/moz.build
+++ b/ipc/netd/moz.build
@@ -7,15 +7,13 @@
 EXPORTS.mozilla.ipc += [
     'Netd.h',
 ]
 
 SOURCES += [
     'Netd.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'moznetd_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/ipc/nfc/moz.build
+++ b/ipc/nfc/moz.build
@@ -6,17 +6,15 @@
 if CONFIG['MOZ_NFC']:
     EXPORTS.mozilla.ipc += [
         'Nfc.h',
     ]
     SOURCES += [
         'Nfc.cpp',
     ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'moznfc_s'
 
 EXPORT_LIBRARY = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/ipc/ril/moz.build
+++ b/ipc/ril/moz.build
@@ -7,15 +7,13 @@
 EXPORTS.mozilla.ipc += [
     'Ril.h',
 ]
 
 SOURCES += [
     'Ril.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'mozril_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/ipc/testshell/moz.build
+++ b/ipc/testshell/moz.build
@@ -22,15 +22,13 @@ SOURCES += [
 
 IPDL_SOURCES = [
     'PTestShell.ipdl',
     'PTestShellCommand.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'ipcshell_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/ipc/unixsocket/moz.build
+++ b/ipc/unixsocket/moz.build
@@ -9,15 +9,13 @@ EXPORTS.mozilla.ipc += [
 ]
 
 SOURCES += [
     'UnixSocket.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'mozipcunixsocket_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/js/ductwork/debugger/moz.build
+++ b/js/ductwork/debugger/moz.build
@@ -17,11 +17,9 @@ SOURCES += [
 ]
 
 LIBRARY_NAME = 'jsdebugger'
 
 EXTRA_JS_MODULES += [
     'jsdebugger.jsm',
 ]
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/js/ipc/moz.build
+++ b/js/ipc/moz.build
@@ -12,15 +12,13 @@ SOURCES += [
 
 IPDL_SOURCES += [
     'JavaScriptTypes.ipdlh',
     'PJavaScript.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'jsipc_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/js/jsd/moz.build
+++ b/js/jsd/moz.build
@@ -31,11 +31,9 @@ SOURCES += [
 
 DEFINES['EXPORT_JSD_API'] = True
 
 if CONFIG['JS_THREADSAFE']:
     DEFINES['JS_THREADSAFE'] = True
 
 LIBRARY_NAME = 'jsd'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/js/xpconnect/loader/moz.build
+++ b/js/xpconnect/loader/moz.build
@@ -14,13 +14,11 @@ LIBRARY_NAME = 'jsloader_s'
 
 EXTRA_JS_MODULES += [
     'ISO8601DateUtils.jsm',
     'XPCOMUtils.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xpconnect_s'

--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -51,17 +51,15 @@ UNIFIED_SOURCES += [
 GENERATED_SOURCES += [
     'DictionaryHelpers.cpp',
     'dom_quickstubs.cpp',
     'GeneratedEvents.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'xpconnect_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'

--- a/js/xpconnect/wrappers/moz.build
+++ b/js/xpconnect/wrappers/moz.build
@@ -21,13 +21,11 @@ SOURCES += [
     'XrayWrapper.cpp',
 ]
 
 LIBRARY_NAME = 'xpcwrappers_s'
 
 # warning C4661 for FilteringWrapper
 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xpconnect_s'

--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -102,17 +102,15 @@ UNIFIED_SOURCES += [
 # nsRefreshDriver.cpp needs to be built separately because of name clashes in the OS X headers
 SOURCES += [
     'nsPresArena.cpp',
     'nsRefreshDriver.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkbase_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'

--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -18,17 +18,15 @@ UNIFIED_SOURCES += [
 
 if CONFIG['MOZ_NFC']:
     LOCAL_INCLUDES += [
         '/dom/nfc'
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gklayout'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@@ -34,13 +34,11 @@ UNIFIED_SOURCES += [
     'nsSelectsAreaFrame.cpp',
     'nsTextControlFrame.cpp',
 ]
 
 LIBRARY_NAME = 'gkforms_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'

--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -96,17 +96,15 @@ SOURCES += [
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     UNIFIED_SOURCES += [
         'nsPluginUtilsOSX.mm',
     ]
 
 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkgeneric_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'

--- a/layout/inspector/src/moz.build
+++ b/layout/inspector/src/moz.build
@@ -24,11 +24,9 @@ if CONFIG['MOZ_XUL']:
     UNIFIED_SOURCES += [
         'inDOMView.cpp',
     ]
 
 LIBRARY_NAME = 'inspector_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'gklayout'

--- a/layout/ipc/moz.build
+++ b/layout/ipc/moz.build
@@ -16,15 +16,13 @@ UNIFIED_SOURCES += [
 ]
 
 IPDL_SOURCES = [
     'PRenderFrame.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'gkipc_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'

--- a/layout/mathml/moz.build
+++ b/layout/mathml/moz.build
@@ -26,13 +26,11 @@ UNIFIED_SOURCES += [
     'nsMathMLOperators.cpp',
     'nsMathMLSelectedFrame.cpp',
     'nsMathMLsemanticsFrame.cpp',
     'nsMathMLTokenFrame.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'gkmathml_s'
 
 FINAL_LIBRARY = 'gklayout'

--- a/layout/printing/moz.build
+++ b/layout/printing/moz.build
@@ -19,11 +19,9 @@ UNIFIED_SOURCES += [
     'nsPrintObject.cpp',
     'nsPrintPreviewListener.cpp',
 ]
 
 LIBRARY_NAME = 'gkprinting_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'gklayout'

--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -122,17 +122,15 @@ UNIFIED_SOURCES += [
 
 # nsCSSRuleProcessor.cpp needs to be built separately because it uses plarena.h.
 SOURCES += [
     'nsCSSRuleProcessor.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkstyle_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'gklayout'

--- a/layout/svg/moz.build
+++ b/layout/svg/moz.build
@@ -43,13 +43,11 @@ UNIFIED_SOURCES += [
     'SVGFEImageFrame.cpp',
     'SVGFELeafFrame.cpp',
     'SVGFEUnstyledLeafFrame.cpp',
     'SVGViewFrame.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'gksvgbase_s'
 
 FINAL_LIBRARY = 'gklayout'

--- a/layout/tables/moz.build
+++ b/layout/tables/moz.build
@@ -24,13 +24,11 @@ UNIFIED_SOURCES += [
     'nsTableRowGroupFrame.cpp',
     'SpanningCellSorter.cpp',
 ]
 
 LIBRARY_NAME = 'gktable_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'

--- a/layout/tools/layout-debug/src/moz.build
+++ b/layout/tools/layout-debug/src/moz.build
@@ -21,11 +21,9 @@ UNIFIED_SOURCES += [
     'nsLayoutDebuggingTools.cpp',
     'nsRegressionTester.cpp',
 ]
 
 LIBRARY_NAME = 'gkdebug'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/layout/xul/base/src/moz.build
+++ b/layout/xul/base/src/moz.build
@@ -49,15 +49,13 @@ if CONFIG['MOZ_XUL']:
         'nsTextBoxFrame.cpp',
         'nsTitleBarFrame.cpp',
         'nsXULLabelFrame.cpp',
         'nsXULPopupManager.cpp',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'gkxulbase_s'
 
 FINAL_LIBRARY = 'gklayout'

--- a/layout/xul/grid/moz.build
+++ b/layout/xul/grid/moz.build
@@ -27,11 +27,9 @@ UNIFIED_SOURCES += [
     'nsGridRowLeafFrame.cpp',
     'nsGridRowLeafLayout.cpp',
 ]
 
 LIBRARY_NAME = 'gkxulgrid_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'gklayout'

--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -30,11 +30,9 @@ UNIFIED_SOURCES += [
     'nsTreeStyleCache.cpp',
     'nsTreeUtils.cpp',
 ]
 
 LIBRARY_NAME = 'gkxultree_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'gklayout'

--- a/media/mtransport/build/moz.build
+++ b/media/mtransport/build/moz.build
@@ -27,18 +27,16 @@ EXPORTS.mtransport += [
 include('../objs.mozbuild')
 
 SOURCES += mtransport_cppsrcs
 
 LIBRARY_NAME = 'mtransport'
 
 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES = [
     '/media/webrtc/trunk/third_party/libjingle/source/',
 ]
 LOCAL_INCLUDES += [
     '/media/mtransport/',
     '/media/mtransport/third_party/',
     '/media/mtransport/third_party/nICEr/src/crypto',
     '/media/mtransport/third_party/nICEr/src/ice',

--- a/mobile/android/components/build/moz.build
+++ b/mobile/android/components/build/moz.build
@@ -25,11 +25,9 @@ if CONFIG['MOZ_ANDROID_HISTORY']:
     ]
     LOCAL_INCLUDES += [
         '/content/base/src',
         '/docshell/base',
     ]
 
 LIBRARY_NAME = 'browsercomps'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/modules/libjar/moz.build
+++ b/modules/libjar/moz.build
@@ -32,15 +32,13 @@ UNIFIED_SOURCES += [
     'nsJARInputStream.cpp',
     'nsJARProtocolHandler.cpp',
     'nsJARURI.cpp',
     'nsZipArchive.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/modules/libjar/zipwriter/src/moz.build
+++ b/modules/libjar/zipwriter/src/moz.build
@@ -10,13 +10,11 @@ UNIFIED_SOURCES += [
     'nsZipHeader.cpp',
     'nsZipWriter.cpp',
     'StreamFunctions.cpp',
     'ZipWriterModule.cpp',
 ]
 
 LIBRARY_NAME = 'zipwriter'
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'

--- a/modules/libpref/src/moz.build
+++ b/modules/libpref/src/moz.build
@@ -7,17 +7,15 @@
 SOURCES += [
     'nsPrefBranch.cpp',
     'nsPrefsFactory.cpp',
     'prefapi.cpp',
     'Preferences.cpp',
     'prefread.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'pref'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/netwerk/base/src/moz.build
+++ b/netwerk/base/src/moz.build
@@ -101,18 +101,16 @@ if CONFIG['MOZ_ENABLE_QTNETWORK']:
     ]
 
 EXTRA_JS_MODULES += [
     'NetUtil.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'neckobase_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'
 LOCAL_INCLUDES += [

--- a/netwerk/build/moz.build
+++ b/netwerk/build/moz.build
@@ -9,17 +9,15 @@ EXPORTS += [
 ]
 
 SOURCES += [
     'nsNetModule.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'necko'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/netwerk/cache/moz.build
+++ b/netwerk/cache/moz.build
@@ -39,13 +39,11 @@ SOURCES += [
     'nsDiskCacheStreams.cpp',
     'nsMemoryCacheDevice.cpp',
 ]
 
 LIBRARY_NAME = 'nkcache_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/cache2/moz.build
+++ b/netwerk/cache2/moz.build
@@ -42,13 +42,11 @@ SOURCES += [
 LOCAL_INCLUDES += [
     '../base/src',
 ]
 
 LIBRARY_NAME = 'nkcache2_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/cookie/moz.build
+++ b/netwerk/cookie/moz.build
@@ -12,17 +12,16 @@ XPIDL_SOURCES += [
     'nsICookieManager2.idl',
     'nsICookiePermission.idl',
     'nsICookieService.idl',
 ]
 
 XPIDL_MODULE = 'necko_cookie'
 
 if CONFIG['NECKO_COOKIES']:
-    LIBXUL_LIBRARY = True
     MSVC_ENABLE_PGO = True
 
     LIBRARY_NAME = 'neckocookie_s'
 
     EXPORTS.mozilla.net = [
         'CookieServiceChild.h',
         'CookieServiceParent.h',
     ]

--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@@ -32,13 +32,11 @@ SOURCES += [
     'nsHostResolver.cpp',
     'nsIDNService.cpp',
 ]
 
 LIBRARY_NAME = 'neckodns_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/ipc/moz.build
+++ b/netwerk/ipc/moz.build
@@ -33,15 +33,13 @@ IPDL_SOURCES = [
     'NeckoChannelParams.ipdlh',
     'PNecko.ipdl',
     'PRemoteOpenFile.ipdl',
     'PRtspController.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'neckoipc_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/mime/moz.build
+++ b/netwerk/mime/moz.build
@@ -19,13 +19,11 @@ EXPORTS += [
 SOURCES += [
     'nsMIMEHeaderParamImpl.cpp',
 ]
 
 LIBRARY_NAME = 'nkmime_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/protocol/about/moz.build
+++ b/netwerk/protocol/about/moz.build
@@ -19,15 +19,13 @@ SOURCES += [
     'nsAboutBloat.cpp',
     'nsAboutCache.cpp',
     'nsAboutCacheEntry.cpp',
     'nsAboutProtocolHandler.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'nkabout_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/protocol/app/moz.build
+++ b/netwerk/protocol/app/moz.build
@@ -7,11 +7,9 @@
 SOURCES += [
     'AppProtocolHandler.cpp',
 ]
 
 LIBRARY_NAME = 'nkapp_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'necko'

--- a/netwerk/protocol/data/moz.build
+++ b/netwerk/protocol/data/moz.build
@@ -8,11 +8,9 @@ UNIFIED_SOURCES += [
     'nsDataChannel.cpp',
     'nsDataHandler.cpp',
 ]
 
 LIBRARY_NAME = 'nkdata_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'necko'

--- a/netwerk/protocol/device/moz.build
+++ b/netwerk/protocol/device/moz.build
@@ -15,15 +15,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
 
 UNIFIED_SOURCES += [
     'nsDeviceChannel.cpp',
     'nsDeviceProtocolHandler.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'nkdevice_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/protocol/file/moz.build
+++ b/netwerk/protocol/file/moz.build
@@ -15,13 +15,11 @@ UNIFIED_SOURCES += [
     'nsFileChannel.cpp',
     'nsFileProtocolHandler.cpp',
 ]
 
 LIBRARY_NAME = 'nkfile_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/protocol/ftp/moz.build
+++ b/netwerk/protocol/ftp/moz.build
@@ -29,17 +29,15 @@ SOURCES += [
 ]
 
 IPDL_SOURCES += [
     'PFTPChannel.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'nkftp_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -88,17 +88,15 @@ EXTRA_JS_MODULES += [
 
 EXTRA_COMPONENTS += [
     'HttpDataUsage.js',
     'HttpDataUsage.manifest',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'nkhttp_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/protocol/res/moz.build
+++ b/netwerk/protocol/res/moz.build
@@ -11,17 +11,15 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'necko_res'
 
 SOURCES += [
     'nsResProtocolHandler.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'nkres_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/protocol/rtsp/moz.build
+++ b/netwerk/protocol/rtsp/moz.build
@@ -35,17 +35,15 @@ SOURCES += [
     'rtsp/ASessionDescription.cpp',
     'rtsp/RTSPSource.cpp',
     'RtspChannel.cpp',
     'RtspHandler.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'nkrtsp_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/protocol/viewsource/moz.build
+++ b/netwerk/protocol/viewsource/moz.build
@@ -14,11 +14,9 @@ UNIFIED_SOURCES += [
     'nsViewSourceChannel.cpp',
     'nsViewSourceHandler.cpp',
 ]
 
 LIBRARY_NAME = 'nkviewsource_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'necko'

--- a/netwerk/protocol/websocket/moz.build
+++ b/netwerk/protocol/websocket/moz.build
@@ -26,17 +26,15 @@ UNIFIED_SOURCES += [
 ]
 
 IPDL_SOURCES += [
     'PWebSocket.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'nkwebsocket_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@@ -24,15 +24,13 @@ UNIFIED_SOURCES += [
 ]
 
 IPDL_SOURCES += [
     'PWyciwygChannel.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'nkwyciwyg_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/sctp/datachannel/moz.build
+++ b/netwerk/sctp/datachannel/moz.build
@@ -13,15 +13,13 @@ EXPORTS.mozilla.net += [
 ]
 
 SOURCES += [
     'DataChannel.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'nkdatachan_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/sctp/src/moz.build
+++ b/netwerk/sctp/src/moz.build
@@ -38,15 +38,13 @@ SOURCES += [
     'user_socket.c',
 ]
 
 if CONFIG['OS_TARGET'] == 'Android':
     SOURCES += [
         'ifaddrs_android.cpp',
     ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'nksctp_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/socket/moz.build
+++ b/netwerk/socket/moz.build
@@ -20,11 +20,9 @@ UNIFIED_SOURCES += [
     'nsSOCKSSocketProvider.cpp',
     'nsUDPSocketProvider.cpp',
 ]
 
 LIBRARY_NAME = 'neckosocket_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'necko'

--- a/netwerk/srtp/src/moz.build
+++ b/netwerk/srtp/src/moz.build
@@ -28,15 +28,13 @@ UNIFIED_SOURCES += [
     'crypto/replay/ut_sim.c',
     'crypto/rng/ctr_prng.c',
     'crypto/rng/prng.c',
     'crypto/rng/rand_source.c',
     'srtp/ekt.c',
     'srtp/srtp.c',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'nksrtp_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/streamconv/converters/moz.build
+++ b/netwerk/streamconv/converters/moz.build
@@ -25,13 +25,11 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'coco
     SOURCES += [
         'nsBinHexDecoder.cpp',
     ]
 
 LIBRARY_NAME = 'nkcnvts_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/streamconv/src/moz.build
+++ b/netwerk/streamconv/src/moz.build
@@ -7,13 +7,11 @@
 FAIL_ON_WARNINGS = True
 
 SOURCES += [
     'nsStreamConverterService.cpp',
 ]
 
 LIBRARY_NAME = 'nkconv_s'
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'necko'

--- a/netwerk/system/android/moz.build
+++ b/netwerk/system/android/moz.build
@@ -7,11 +7,9 @@
 SOURCES += [
     'nsAndroidNetworkLinkService.cpp',
 ]
 
 LIBRARY_NAME = 'neckosystem_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'necko'

--- a/netwerk/system/mac/moz.build
+++ b/netwerk/system/mac/moz.build
@@ -7,11 +7,9 @@
 LIBRARY_NAME = 'neckosystem_s'
 
 SOURCES += [
     'nsNetworkLinkService.mm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'necko'

--- a/netwerk/system/qt/moz.build
+++ b/netwerk/system/qt/moz.build
@@ -12,11 +12,9 @@ SOURCES += [
 GENERATED_SOURCES += [
     'moc_nsQtNetworkManager.cpp',
 ]
 
 LIBRARY_NAME = 'neckosystem_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'necko'

--- a/netwerk/system/win32/moz.build
+++ b/netwerk/system/win32/moz.build
@@ -8,11 +8,9 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
         'nsNotifyAddrListener.cpp',
     ]
 
 LIBRARY_NAME = 'neckosystem_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'necko'

--- a/netwerk/wifi/moz.build
+++ b/netwerk/wifi/moz.build
@@ -47,11 +47,9 @@ elif CONFIG['OS_ARCH'] == 'SunOS':
 
 if CONFIG['NECKO_WIFI_DBUS']:
     UNIFIED_SOURCES += [
         'nsWifiScannerDBus.cpp',
     ]
 
 LIBRARY_NAME = 'neckowifi_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'necko'

--- a/other-licenses/skia-npapi/moz.build
+++ b/other-licenses/skia-npapi/moz.build
@@ -13,11 +13,9 @@ SOURCES += [
     'ANPPaint.cpp',
     'ANPPath.cpp',
     'ANPTypeface.cpp',
     'SkANP.cpp',
 ]
 
 LIBRARY_NAME = 'skia_npapi'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/other-licenses/snappy/moz.build
+++ b/other-licenses/snappy/moz.build
@@ -14,11 +14,9 @@ SOURCES += [
     'src/snappy-c.cc',
     'src/snappy-sinksource.cc',
     'src/snappy-stubs-internal.cc',
     'src/snappy.cc',
 ]
 
 LIBRARY_NAME = 'snappy_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/parser/html/moz.build
+++ b/parser/html/moz.build
@@ -80,13 +80,11 @@ UNIFIED_SOURCES += [
     'nsHtml5TreeOpStage.cpp',
     'nsHtml5UTF16Buffer.cpp',
     'nsHtml5ViewSourceUtils.cpp',
     'nsParserUtils.cpp',
 ]
 
 LIBRARY_NAME = 'html5p_s'
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'

--- a/parser/htmlparser/src/moz.build
+++ b/parser/htmlparser/src/moz.build
@@ -19,11 +19,9 @@ UNIFIED_SOURCES += [
     'nsScanner.cpp',
     'nsScannerString.cpp',
 ]
 
 LIBRARY_NAME = 'htmlpars'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/parser/xml/src/moz.build
+++ b/parser/xml/src/moz.build
@@ -13,13 +13,11 @@ EXPORTS += [
 SOURCES += [
     'nsSAXAttributes.cpp',
     'nsSAXLocator.cpp',
     'nsSAXXMLReader.cpp',
 ]
 
 LIBRARY_NAME = 'saxp'
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'htmlpars'

--- a/rdf/base/src/moz.build
+++ b/rdf/base/src/moz.build
@@ -18,11 +18,9 @@ SOURCES += [
     'nsRDFXMLParser.cpp',
     'nsRDFXMLSerializer.cpp',
     'rdfTriplesSerializer.cpp',
     'rdfutil.cpp',
 ]
 
 LIBRARY_NAME = 'rdfbase_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'rdf'

--- a/rdf/build/moz.build
+++ b/rdf/build/moz.build
@@ -9,11 +9,9 @@ EXPORTS += [
 ]
 
 SOURCES += [
     'nsRDFModule.cpp',
 ]
 
 LIBRARY_NAME = 'rdf'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/rdf/datasource/src/moz.build
+++ b/rdf/datasource/src/moz.build
@@ -6,11 +6,9 @@
 
 SOURCES += [
     'nsFileSystemDataSource.cpp',
     'nsLocalStore.cpp',
 ]
 
 LIBRARY_NAME = 'rdfdatasource_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'rdf'

--- a/rdf/util/src/internal/moz.build
+++ b/rdf/util/src/internal/moz.build
@@ -5,11 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include('../objs.mozbuild')
 
 SOURCES += rdf_util_src_cppsrcs
 
 LIBRARY_NAME = 'rdfutil_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/security/manager/boot/src/moz.build
+++ b/security/manager/boot/src/moz.build
@@ -12,13 +12,11 @@ SOURCES += [
     'nsSecurityWarningDialogs.cpp',
     'nsSiteSecurityService.cpp',
 ]
 
 LIBRARY_NAME = 'pipboot'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'

--- a/security/manager/pki/src/moz.build
+++ b/security/manager/pki/src/moz.build
@@ -12,11 +12,9 @@ SOURCES += [
     'nsPKIModule.cpp',
     'nsPKIParamBlock.cpp',
 ]
 
 LIBRARY_NAME = 'pippki'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/security/manager/ssl/src/moz.build
+++ b/security/manager/ssl/src/moz.build
@@ -82,11 +82,9 @@ if CONFIG['MOZ_XUL']:
     ]
 
 LIBRARY_NAME = 'pipnss'
 
 SOURCES += [
     'md4.c',
 ]
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/security/sandbox/linux/moz.build
+++ b/security/sandbox/linux/moz.build
@@ -9,15 +9,13 @@ FAIL_ON_WARNINGS = True
 EXPORTS.mozilla += [
     'Sandbox.h',
 ]
 
 SOURCES += [
     'Sandbox.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'sandbox_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/services/crypto/component/moz.build
+++ b/services/crypto/component/moz.build
@@ -15,11 +15,9 @@ XPIDL_MODULE = 'services-crypto-componen
 SOURCES += [
     'nsSyncJPAKE.cpp',
 ]
 
 LIBRARY_NAME = 'services-crypto'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/startupcache/moz.build
+++ b/startupcache/moz.build
@@ -21,11 +21,9 @@ EXPORTS.mozilla.scache += [
 SOURCES += [
     'StartupCache.cpp',
     'StartupCacheModule.cpp',
     'StartupCacheUtils.cpp',
 ]
 
 LIBRARY_NAME = 'startupcache'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/storage/build/moz.build
+++ b/storage/build/moz.build
@@ -9,11 +9,9 @@ EXPORTS += [
 ]
 
 SOURCES += [
     'mozStorageModule.cpp',
 ]
 
 LIBRARY_NAME = 'storagecomps'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/storage/src/moz.build
+++ b/storage/src/moz.build
@@ -36,11 +36,9 @@ UNIFIED_SOURCES += [
 # These files need to be built separately because they #include variantToSQLiteT_impl.h.
 SOURCES += [
     'mozStorageBindingParams.cpp',
     'mozStorageConnection.cpp',
 ]
 
 LIBRARY_NAME = 'storage_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'storagecomps'

--- a/toolkit/components/alerts/moz.build
+++ b/toolkit/components/alerts/moz.build
@@ -12,15 +12,13 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'alerts'
 
 SOURCES += [
     'nsAlertsService.cpp',
     'nsXULAlerts.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'alerts_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'toolkitcomps'

--- a/toolkit/components/autocomplete/moz.build
+++ b/toolkit/components/autocomplete/moz.build
@@ -21,11 +21,9 @@ SOURCES += [
     'nsAutoCompleteController.cpp',
     'nsAutoCompleteSimpleResult.cpp',
 ]
 
 LIBRARY_NAME = 'tkautocomplete'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/toolkit/components/build/moz.build
+++ b/toolkit/components/build/moz.build
@@ -7,13 +7,11 @@
 EXPORTS += [
     'nsToolkitCompsCID.h',
 ]
 
 SOURCES += [
     'nsToolkitCompsModule.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'toolkitcomps'
 
 FINAL_LIBRARY = 'xul'

--- a/toolkit/components/commandlines/moz.build
+++ b/toolkit/components/commandlines/moz.build
@@ -16,11 +16,9 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'commandlines'
 
 SOURCES += [
     'nsCommandLine.cpp',
 ]
 
 LIBRARY_NAME = 'commandlines'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/toolkit/components/ctypes/moz.build
+++ b/toolkit/components/ctypes/moz.build
@@ -15,11 +15,9 @@ LOCAL_INCLUDES += [
 ]
 
 LIBRARY_NAME = 'jsctypes'
 
 EXTRA_JS_MODULES += [
     'ctypes.jsm',
 ]
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/toolkit/components/diskspacewatcher/moz.build
+++ b/toolkit/components/diskspacewatcher/moz.build
@@ -14,15 +14,13 @@ EXPORTS += [
 
 XPIDL_MODULE = 'diskspacewatcher'
 XPIDL_MODULE = 'toolkitcomps'
 
 SOURCES = [
     'DiskSpaceWatcher.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'diskspacewatcher'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/toolkit/components/downloads/moz.build
+++ b/toolkit/components/downloads/moz.build
@@ -37,13 +37,11 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 if not CONFIG['MOZ_SUITE']:
     EXTRA_COMPONENTS += [
         'nsDownloadManagerUI.js',
         'nsDownloadManagerUI.manifest',
     ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'download_s'
 
 FINAL_LIBRARY = 'toolkitcomps'

--- a/toolkit/components/filepicker/moz.build
+++ b/toolkit/components/filepicker/moz.build
@@ -1,17 +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/.
 
 if CONFIG['MOZ_XUL'] and \
     CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('android', 'qt', 'os2', 'cocoa', 'windows'):
-        LIBXUL_LIBRARY = True
         XPIDL_MODULE = 'filepicker'
         LIBRARY_NAME = 'fileview'
         XPIDL_SOURCES += [
             'nsIFileView.idl',
         ]
         SOURCES += [
             'nsFileView.cpp',
         ]

--- a/toolkit/components/finalizationwitness/moz.build
+++ b/toolkit/components/finalizationwitness/moz.build
@@ -18,11 +18,10 @@ EXPORTS.mozilla += [
     'FinalizationWitnessService.h',
 ]
 
 LOCAL_INCLUDES += [
     '/js/xpconnect/loader',
 ]
 
 LIBRARY_NAME = 'finalizationwitness_s'
-LIBXUL_LIBRARY = True
 
 FINAL_LIBRARY = 'toolkitcomps'

--- a/toolkit/components/find/moz.build
+++ b/toolkit/components/find/moz.build
@@ -11,11 +11,9 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'mozfind'
 
 SOURCES += [
     'nsFindService.cpp',
 ]
 
 LIBRARY_NAME = 'mozfind_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'toolkitcomps'

--- a/toolkit/components/intl/moz.build
+++ b/toolkit/components/intl/moz.build
@@ -5,11 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsCharsetMenu.cpp',
 ]
 
 LIBRARY_NAME = 'intl_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'toolkitcomps'

--- a/toolkit/components/jsdownloads/src/moz.build
+++ b/toolkit/components/jsdownloads/src/moz.build
@@ -5,18 +5,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'DownloadPlatform.cpp',
 ]
 
 LIBRARY_NAME = 'jsdownloads_s'
 
-LIBXUL_LIBRARY = True
-
 EXTRA_COMPONENTS += [
     'DownloadLegacy.js',
     'Downloads.manifest',
 ]
 
 EXTRA_JS_MODULES += [
     'DownloadCore.jsm',
     'DownloadImport.jsm',

--- a/toolkit/components/mediasniffer/moz.build
+++ b/toolkit/components/mediasniffer/moz.build
@@ -14,13 +14,11 @@ SOURCES += [
     'nsMediaSniffer.cpp',
     'nsMediaSnifferModule.cpp',
 ]
 
 SOURCES += [
     'mp3sniff.c',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'mediasniffer'
 
 FINAL_LIBRARY = 'xul'

--- a/toolkit/components/parentalcontrols/moz.build
+++ b/toolkit/components/parentalcontrols/moz.build
@@ -6,14 +6,13 @@
 
 XPIDL_SOURCES += [
     'nsIParentalControlsService.idl',
 ]
 
 XPIDL_MODULE = 'parentalcontrols'
 
 if not CONFIG['MOZ_DISABLE_PARENTAL_CONTROLS'] and CONFIG['OS_ARCH'] == 'WINNT':
-    LIBXUL_LIBRARY = True
     LIBRARY_NAME = 'parentalcontrols_s'
     SOURCES += [
         'nsParentalControlsServiceWin.cpp',
     ]
     FINAL_LIBRARY = 'toolkitcomps'

--- a/toolkit/components/perf/moz.build
+++ b/toolkit/components/perf/moz.build
@@ -11,11 +11,9 @@ SOURCES += [
 LIBRARY_NAME = 'jsperf'
 
 EXTRA_JS_MODULES += [
     'PerfMeasurement.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/toolkit/components/places/moz.build
+++ b/toolkit/components/places/moz.build
@@ -9,17 +9,16 @@ if CONFIG['MOZ_PLACES']:
 
 XPIDL_SOURCES += [
     'nsINavHistoryService.idl',
 ]
 
 XPIDL_MODULE = 'places'
 
 if CONFIG['MOZ_PLACES']:
-    LIBXUL_LIBRARY = True
     MSVC_ENABLE_PGO = True
     LIBRARY_NAME = 'places'
 
     XPIDL_SOURCES += [
         'mozIAsyncFavicons.idl',
         'mozIAsyncHistory.idl',
         'mozIAsyncLivemarks.idl',
         'mozIColorAnalyzer.idl',

--- a/toolkit/components/reflect/moz.build
+++ b/toolkit/components/reflect/moz.build
@@ -9,11 +9,9 @@ SOURCES += [
 ]
 
 LIBRARY_NAME = 'jsreflect'
 
 EXTRA_JS_MODULES += [
     'reflect.jsm',
 ]
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/toolkit/components/remote/moz.build
+++ b/toolkit/components/remote/moz.build
@@ -20,11 +20,9 @@ if CONFIG['MOZ_ENABLE_GTK']:
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     SOURCES += [
         'nsQtRemoteService.cpp',
     ]
 
 LIBRARY_NAME = 'remoteservice'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/toolkit/components/satchel/moz.build
+++ b/toolkit/components/satchel/moz.build
@@ -39,11 +39,9 @@ LIBRARY_NAME = 'satchel'
 EXTRA_JS_MODULES += [
     'nsFormAutoCompleteResult.jsm',
 ]
 
 EXTRA_PP_JS_MODULES += [
     'FormHistory.jsm',
 ]
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/toolkit/components/startup/moz.build
+++ b/toolkit/components/startup/moz.build
@@ -33,11 +33,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
     ]
 else:
     SOURCES += [
         'nsUserInfoUnix.cpp',
     ]
 
 LIBRARY_NAME = 'appstartup_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'toolkitcomps'

--- a/toolkit/components/statusfilter/moz.build
+++ b/toolkit/components/statusfilter/moz.build
@@ -5,11 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsBrowserStatusFilter.cpp',
 ]
 
 LIBRARY_NAME = 'mozbrwsr_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'toolkitcomps'

--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -33,17 +33,15 @@ EXTRA_PP_COMPONENTS += [
 EXTRA_JS_MODULES += [
     'TelemetryFile.jsm',
     'TelemetryStopwatch.jsm',
     'ThirdPartyCookieProbe.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'telemetry'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/toolkit/components/typeaheadfind/moz.build
+++ b/toolkit/components/typeaheadfind/moz.build
@@ -11,11 +11,9 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'fastfind'
 
 SOURCES += [
     'nsTypeAheadFind.cpp',
 ]
 
 LIBRARY_NAME = 'fastfind_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'toolkitcomps'

--- a/toolkit/components/url-classifier/moz.build
+++ b/toolkit/components/url-classifier/moz.build
@@ -51,13 +51,11 @@ EXTRA_JS_MODULES += [
 EXPORTS += [
     'Entries.h',
     'LookupCache.h',
     'nsUrlClassifierPrefixSet.h',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'toolkitcomps'

--- a/toolkit/crashreporter/moz.build
+++ b/toolkit/crashreporter/moz.build
@@ -71,17 +71,15 @@ if CONFIG['OS_ARCH'] == 'Darwin':
     ]
 
 EXTRA_JS_MODULES += [
     'CrashReports.jsm',
     'CrashSubmit.jsm',
     'KeyValueParser.jsm',
 ]
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'exception_handler_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xulapp_s'

--- a/toolkit/devtools/server/moz.build
+++ b/toolkit/devtools/server/moz.build
@@ -13,11 +13,9 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'jsinspector'
 
 SOURCES += [
     'nsJSInspector.cpp',
 ]
 
 LIBRARY_NAME = 'jsinspector'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/toolkit/identity/moz.build
+++ b/toolkit/identity/moz.build
@@ -29,11 +29,9 @@ EXTRA_JS_MODULES += [
     'LogUtils.jsm',
     'MinimalIdentity.jsm',
     'RelyingParty.jsm',
     'Sandbox.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/toolkit/mozapps/update/common/moz.build
+++ b/toolkit/mozapps/update/common/moz.build
@@ -15,15 +15,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
         'pathhash.h',
         'uachelper.h',
         'updatehelper.cpp',
         'updatehelper.h',
     ]
 
 LIBRARY_NAME = 'updatecommon'
 
-LIBXUL_LIBRARY = True
-
 srcdir = '.'
 
 include('sources.mozbuild')
 
 FINAL_LIBRARY = 'xulapp_s'

--- a/toolkit/profile/moz.build
+++ b/toolkit/profile/moz.build
@@ -17,16 +17,14 @@ XPIDL_MODULE = 'toolkitprofile'
 SOURCES += [ TOPSRCDIR + '/profile/dirserviceprovider/src/nsProfileLock.cpp' ]
 
 SOURCES += [
     'nsToolkitProfileService.cpp'
 ]
 
 LIBRARY_NAME = 'profile_s'
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '../xre',
     '/profile/dirserviceprovider/src',
 ]
 
 FINAL_LIBRARY = 'xulapp_s'

--- a/toolkit/system/androidproxy/moz.build
+++ b/toolkit/system/androidproxy/moz.build
@@ -5,11 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsAndroidSystemProxySettings.cpp',
 ]
 
 LIBRARY_NAME = 'androidproxy'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/toolkit/system/osxproxy/moz.build
+++ b/toolkit/system/osxproxy/moz.build
@@ -5,11 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsOSXSystemProxySettings.mm',
 ]
 
 LIBRARY_NAME = 'osxproxy'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/toolkit/system/unixproxy/moz.build
+++ b/toolkit/system/unixproxy/moz.build
@@ -10,11 +10,9 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']:
     ]
 else:
     SOURCES += [
         'nsUnixSystemProxySettings.cpp',
     ]
 
 LIBRARY_NAME = 'unixproxy'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/toolkit/system/windowsproxy/moz.build
+++ b/toolkit/system/windowsproxy/moz.build
@@ -5,11 +5,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsWindowsSystemProxySettings.cpp',
 ]
 
 LIBRARY_NAME = 'windowsproxy'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -90,17 +90,15 @@ if CONFIG['MOZ_INSTRUMENT_EVENT_LOOP']:
     ]
 
 if CONFIG['MOZ_UPDATER']:
     if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
         SOURCES += [
             'nsUpdateDriver.cpp',
         ]
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'xulapp_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/tools/profiler/moz.build
+++ b/tools/profiler/moz.build
@@ -2,18 +2,16 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_ENABLE_PROFILER_SPS']:
     FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
 
-    LIBXUL_LIBRARY = True
-
     XPIDL_MODULE = 'profiler'
     LIBRARY_NAME = 'profiler'
     XPIDL_SOURCES += [
         'nsIProfiler.idl',
         'nsIProfileSaveEvent.idl',
     ]
     EXPORTS += [
         'GeckoProfilerFunc.h',

--- a/tools/trace-malloc/lib/moz.build
+++ b/tools/trace-malloc/lib/moz.build
@@ -19,11 +19,9 @@ SOURCES += [
 if CONFIG['OS_ARCH'] == 'WINNT':
     SOURCES += [
         'nsDebugHelpWin32.cpp',
         'nsWinTraceMalloc.cpp',
     ]
 
 LIBRARY_NAME = 'tracemalloc'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xpcom_core'

--- a/uriloader/base/moz.build
+++ b/uriloader/base/moz.build
@@ -27,13 +27,11 @@ SOURCES += [
     'nsDocLoader.cpp',
     'nsURILoader.cpp',
 ]
 
 LIBRARY_NAME = 'uriloaderbase_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'

--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@@ -125,15 +125,13 @@ EXTRA_COMPONENTS += [
 ]
 
 IPDL_SOURCES += [
     'PExternalHelperApp.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'exthandler_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/uriloader/prefetch/moz.build
+++ b/uriloader/prefetch/moz.build
@@ -30,15 +30,13 @@ SOURCES += [
 ]
 
 IPDL_SOURCES += [
     'POfflineCacheUpdate.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'prefetch_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/view/src/moz.build
+++ b/view/src/moz.build
@@ -8,13 +8,11 @@ SOURCES += [
     'nsView.cpp',
     'nsViewManager.cpp',
 ]
 
 LIBRARY_NAME = 'gkview_s'
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'gklayout'

--- a/widget/android/moz.build
+++ b/widget/android/moz.build
@@ -36,15 +36,13 @@ SOURCES += [
     'nsPrintOptionsAndroid.cpp',
     'nsScreenManagerAndroid.cpp',
     'nsWidgetFactory.cpp',
     'nsWindow.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'widget_android'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/widget/cocoa/moz.build
+++ b/widget/cocoa/moz.build
@@ -14,18 +14,16 @@ EXPORTS += [
     'mozView.h',
     'nsChangeObserver.h',
     'nsCocoaFeatures.h',
     'nsCocoaUtils.h',
 ]
 
 LIBRARY_NAME = 'widget_mac'
 
-LIBXUL_LIBRARY = True
-
 UNIFIED_SOURCES += [
     'GfxInfo.mm',
     'NativeKeyBindings.mm',
     'nsAppShell.mm',
     'nsBidiKeyboard.mm',
     'nsChildView.mm',
     'nsClipboard.mm',
     'nsCocoaFeatures.mm',

--- a/widget/gonk/moz.build
+++ b/widget/gonk/moz.build
@@ -52,15 +52,13 @@ SOURCES += [
     'nsIdleServiceGonk.cpp',
     'nsLookAndFeel.cpp',
     'nsWidgetFactory.cpp',
     'nsWindow.cpp',
     'OrientationObserver.cpp',
     'ProcessOrientation.cpp'
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'widget_gonk'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/widget/gonk/nativewindow/moz.build
+++ b/widget/gonk/nativewindow/moz.build
@@ -43,15 +43,13 @@ if CONFIG['MOZ_B2G_CAMERA'] or CONFIG['M
     elif CONFIG['ANDROID_VERSION'] == '15':
         SOURCES += [
             'GonkNativeWindowClientICS.cpp',
             'GonkNativeWindowICS.cpp',
         ]
 
 FAIL_ON_WARNINGS = True
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'nativewindow'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build
@@ -58,18 +58,16 @@ if CONFIG['MOZ_X11']:
     ]
 
 FAIL_ON_WARNINGS = True
 
 SOURCES += [
     'mozcontainer.c',
 ]
 
-LIBXUL_LIBRARY = True
-
 if CONFIG['ACCESSIBILITY']:
     SOURCES += [
         'maiRedundantObjectFactory.c',
     ]
 
 if CONFIG['MOZ_ENABLE_GTK2']:
     SOURCES += [
         'gtk2drawing.c',

--- a/widget/gtkxtbin/moz.build
+++ b/widget/gtkxtbin/moz.build
@@ -5,16 +5,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXPORTS += [
     'gtk2xtbin.h',
 ]
 
 LIBRARY_NAME = 'gtkxtbin'
 
-LIBXUL_LIBRARY = True
-
 if CONFIG['MOZ_ENABLE_GTK2']:
     SOURCES += [
         'gtk2xtbin.c',
     ]
 
 FINAL_LIBRARY = 'xul'

--- a/widget/os2/moz.build
+++ b/widget/os2/moz.build
@@ -22,11 +22,9 @@ SOURCES += [
     'nsSound.cpp',
     'nsWidgetFactory.cpp',
     'nsWindow.cpp',
     'os2FrameWindow.cpp',
 ]
 
 LIBRARY_NAME = 'wdgtos2'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

--- a/widget/qt/moz.build
+++ b/widget/qt/moz.build
@@ -51,15 +51,13 @@ if CONFIG['MOZ_ENABLE_CONTENTMANAGER']:
 if CONFIG[' MOZ_ENABLE_QTMOBILITY']:
     SOURCES += [
         'mozqorientationsensorfilter.cpp',
     ]
     GENERATED_SOURCES += [
         'moc_mozqorientationsensorfilter.cpp',
     ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'widget_qt'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/widget/shared/moz.build
+++ b/widget/shared/moz.build
@@ -8,15 +8,13 @@ if CONFIG['MOZ_X11']:
     PARALLEL_DIRS += ['x11']
 
 UNIFIED_SOURCES += [
     'nsShmImage.cpp',
     'SharedWidgetUtils.cpp',
     'WidgetEventImpl.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'widget_shared'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xpwidgets_s'

--- a/widget/shared/x11/moz.build
+++ b/widget/shared/x11/moz.build
@@ -3,13 +3,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'keysym2ucs.c',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'widget_shared_x11'
 
 FINAL_LIBRARY = 'xpwidgets_s'

--- a/widget/windows/moz.build
+++ b/widget/windows/moz.build
@@ -76,17 +76,15 @@ if CONFIG['NS_PRINTING']:
         'nsPrintSettingsWin.cpp',
     ]
 
 if CONFIG['NS_ENABLE_TSF']:
     SOURCES += [
         'nsTextStore.cpp',
     ]
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'widget_windows'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/widget/windows/winrt/moz.build
+++ b/widget/windows/winrt/moz.build
@@ -20,15 +20,13 @@ SOURCES += [
     'UIABridge.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'MetroUIUtils.js',
     'MetroUIUtils.manifest',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'widget_winrt'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/widget/xpwidgets/moz.build
+++ b/widget/xpwidgets/moz.build
@@ -58,18 +58,16 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt'
         'nsBaseFilePicker.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt', 'gtk2', 'gtk3', 'windows', 'cocoa'):
     UNIFIED_SOURCES += [
         'nsNativeTheme.cpp',
     ]
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'xpwidgets_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     FINAL_LIBRARY = 'widget_mac'

--- a/xpcom/base/moz.build
+++ b/xpcom/base/moz.build
@@ -120,17 +120,16 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
         'nsCrashOnException.cpp',
     ]
 
 SOURCES += [
     'nsErrorAssertsC.c',
 ]
 
 
-LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'xpcombase_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xpcom_core'

--- a/xpcom/build/moz.build
+++ b/xpcom/build/moz.build
@@ -52,17 +52,15 @@ SOURCES += [
     'FrozenFunctions.cpp',
     'LateWriteChecks.cpp',
     'nsXPComInit.cpp',
     'nsXPCOMStrings.cpp',
     'Omnijar.cpp',
     'Services.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'xpcom_core'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'

--- a/xpcom/components/moz.build
+++ b/xpcom/components/moz.build
@@ -30,13 +30,11 @@ SOURCES += [
     'ManifestParser.cpp',
     'nsCategoryManager.cpp',
     'nsComponentManager.cpp',
     'nsNativeComponentLoader.cpp',
 ]
 
 LIBRARY_NAME = 'xpcomcomponents_s'
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xpcom_core'

--- a/xpcom/ds/moz.build
+++ b/xpcom/ds/moz.build
@@ -108,17 +108,15 @@ elif CONFIG['COMPILE_ENVIRONMENT']:
 
 EXTRA_COMPONENTS += [
     'nsINIProcessor.js',
     'nsINIProcessor.manifest',
 ]
 
 LIBRARY_NAME = 'xpcomds_s'
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../io',
 ]
 
 FINAL_LIBRARY = 'xpcom_core'

--- a/xpcom/io/moz.build
+++ b/xpcom/io/moz.build
@@ -115,17 +115,15 @@ SOURCES += [
     'SpecialSystemDirectory.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     SOURCES += [
         'CocoaFileUtils.mm',
     ]
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LIBRARY_NAME = 'xpcomio_s'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xpcom_core'

--- a/xpcom/reflect/xptcall/src/moz.build
+++ b/xpcom/reflect/xptcall/src/moz.build
@@ -9,15 +9,13 @@ DIRS += ['md']
 SOURCES += [
     'xptcall.cpp',
 ]
 
 LIBRARY_NAME = 'xptcall'
 
 MSVC_ENABLE_PGO = True
 
-LIBXUL_LIBRARY = True
-
 LOCAL_INCLUDES += [
     '/xpcom/reflect/xptinfo/src',
 ]
 
 FINAL_LIBRARY = 'xpcom_core'

--- a/xpcom/reflect/xptinfo/src/moz.build
+++ b/xpcom/reflect/xptinfo/src/moz.build
@@ -10,16 +10,14 @@ SOURCES += [
     'xptiTypelibGuts.cpp',
     'xptiWorkingSet.cpp',
 ]
 
 LIBRARY_NAME = 'xptinfo'
 
 MSVC_ENABLE_PGO = True
 
-LIBXUL_LIBRARY = True
-
 # For nsManifestLineReader class.
 LOCAL_INCLUDES += [
     '/xpcom/ds',
 ]
 
 FINAL_LIBRARY = 'xpcom_core'

--- a/xpcom/threads/moz.build
+++ b/xpcom/threads/moz.build
@@ -44,17 +44,15 @@ SOURCES += [
     'nsThreadManager.cpp',
     'nsThreadPool.cpp',
     'nsTimerImpl.cpp',
     'TimerThread.cpp',
 ]
 
 LIBRARY_NAME = 'xpcomthreads_s'
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '../build',
 ]
 
 FINAL_LIBRARY = 'xpcom_core'

--- a/xpcom/typelib/xpt/src/moz.build
+++ b/xpcom/typelib/xpt/src/moz.build
@@ -7,11 +7,9 @@
 LIBRARY_NAME = 'xpt'
 
 SOURCES += [
     'xpt_arena.c',
     'xpt_struct.c',
     'xpt_xdr.c',
 ]
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xpcom_core'

--- a/xpfe/appshell/src/moz.build
+++ b/xpfe/appshell/src/moz.build
@@ -18,13 +18,11 @@ SOURCES += [
 ]
 
 LOCAL_INCLUDES += [
     '/dom/base',
 ]
 
 LIBRARY_NAME = 'nsappshell'
 
-LIBXUL_LIBRARY = True
-
 MSVC_ENABLE_PGO = True
 
 FINAL_LIBRARY = 'xul'

--- a/xpfe/components/build/moz.build
+++ b/xpfe/components/build/moz.build
@@ -3,13 +3,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 SOURCES += [
     'nsModule.cpp',
 ]
 
-LIBXUL_LIBRARY = True
-
 LIBRARY_NAME = 'appcomps'
 
 FINAL_LIBRARY = 'xul'

--- a/xpfe/components/directory/moz.build
+++ b/xpfe/components/directory/moz.build
@@ -11,11 +11,9 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'directory'
 
 SOURCES += [
     'nsDirectoryViewer.cpp',
 ]
 
 LIBRARY_NAME = 'directory_s'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'appcomps'

--- a/xpfe/components/windowds/moz.build
+++ b/xpfe/components/windowds/moz.build
@@ -11,11 +11,9 @@ XPIDL_SOURCES += [
 XPIDL_MODULE = 'windowds'
 
 SOURCES += [
     'nsWindowDataSource.cpp',
 ]
 
 LIBRARY_NAME = 'windowds'
 
-LIBXUL_LIBRARY = True
-
 FINAL_LIBRARY = 'xul'

author	Mike Hommey <mh+mozilla@glandium.org>
	Tue, 19 Nov 2013 11:48:10 +0900
changeset 171755	71cbd5b14aecd782163fbeb0c63b4b73a38ba7a1
parent 171754	6d271ac31d9a1a39cc33fafc227bf3b448496188
child 171756	7222bce61677d45e005d9af6222ce5c92dd4cb99
push id	445
push user	ffxbld
push date	Mon, 10 Mar 2014 22:05:19 +0000
treeherder	mozilla-release@dc38b741b04e [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	gps
bugs	939074
milestone	28.0a1
first release with	nightly linux32 ba9ecdea3a90 / 28.0a1 / 20131119030202 / files nightly linux64 ba9ecdea3a90 / 28.0a1 / 20131119030202 / files nightly mac ba9ecdea3a90 / 28.0a1 / 20131119030202 / files nightly win32 ba9ecdea3a90 / 28.0a1 / 20131119030202 / files nightly win64 ba9ecdea3a90 / 28.0a1 / 20131119030202 / files
last release without	nightly linux32 f2adb62d07eb / 28.0a1 / 20131118094134 / files nightly linux64 f2adb62d07eb / 28.0a1 / 20131118094134 / files nightly mac f2adb62d07eb / 28.0a1 / 20131118094134 / files nightly win32 f2adb62d07eb / 28.0a1 / 20131118094134 / files nightly win64 f2adb62d07eb / 28.0a1 / 20131118094134 / files