--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -37,17 +37,17 @@ EXPORTS += [
'nsTraversal.h',
]
if CONFIG['MOZ_WEBRTC']:
EXPORTS += [
'nsDOMDataChannel.h',
'nsDOMDataChannelDeclarations.h',
]
- SOURCES += [
+ UNIFIED_SOURCES += [
'nsDOMDataChannel.cpp',
]
LOCAL_INCLUDES += [
'/netwerk/sctp/datachannel',
]
# Are we targeting x86-32 or x86-64? If so, we want to include SSE2 code for
# nsTextFragment.cpp
@@ -119,16 +119,17 @@ UNIFIED_SOURCES += [
'nsContentSink.cpp',
'nsCopySupport.cpp',
'nsCrossSiteListenerProxy.cpp',
'nsCSPContext.cpp',
'nsCSPParser.cpp',
'nsCSPService.cpp',
'nsCSPUtils.cpp',
'nsDataDocumentContentPolicy.cpp',
+ 'nsDocument.cpp',
'nsDocumentEncoder.cpp',
'nsDOMAttributeMap.cpp',
'nsDOMCaretPosition.cpp',
'nsDOMFileReader.cpp',
'nsDOMMutationObserver.cpp',
'nsDOMSerializer.cpp',
'nsDOMSettableTokenList.cpp',
'nsDOMTokenList.cpp',
@@ -145,16 +146,17 @@ UNIFIED_SOURCES += [
'nsINode.cpp',
'nsInProcessTabChildGlobal.cpp',
'nsLineBreaker.cpp',
'nsMappedAttributeElement.cpp',
'nsMappedAttributes.cpp',
'nsMixedContentBlocker.cpp',
'nsNameSpaceManager.cpp',
'nsNoDataProtocolContentPolicy.cpp',
+ 'nsNodeInfoManager.cpp',
'nsNodeUtils.cpp',
'nsPlainTextSerializer.cpp',
'nsPropertyTable.cpp',
'nsRange.cpp',
'nsReferencedElement.cpp',
'nsScriptElement.cpp',
'nsScriptLoader.cpp',
'nsStubDocumentObserver.cpp',
@@ -179,22 +181,16 @@ UNIFIED_SOURCES += [
'TreeWalker.cpp',
'WebSocket.cpp',
]
SOURCES += [
'nsImageLoadingContent.cpp',
]
-# These files cannot be built in unified mode because they use FORCE_PR_LOG
-SOURCES += [
- 'nsDocument.cpp',
- 'nsNodeInfoManager.cpp',
-]
-
# These files cannot be built in unified mode because of OS X headers.
SOURCES += [
'nsContentUtils.cpp',
'nsObjectLoadingContent.cpp',
]
EXTRA_COMPONENTS += [
'contentAreaDropListener.js',
--- a/content/media/moz.build
+++ b/content/media/moz.build
@@ -135,16 +135,17 @@ UNIFIED_SOURCES += [
'AudioStreamTrack.cpp',
'AudioTrack.cpp',
'AudioTrackList.cpp',
'CubebUtils.cpp',
'DOMMediaStream.cpp',
'EncodedBufferCache.cpp',
'FileBlockCache.cpp',
"GraphDriver.cpp",
+ 'Latency.cpp',
'MediaCache.cpp',
'MediaData.cpp',
'MediaDecoder.cpp',
'MediaDecoderReader.cpp',
'MediaDecoderStateMachine.cpp',
'MediaDecoderStateMachineScheduler.cpp',
'MediaRecorder.cpp',
'MediaResource.cpp',
@@ -172,20 +173,18 @@ UNIFIED_SOURCES += [
'VideoUtils.cpp',
'WebVTTListener.cpp',
]
if CONFIG['OS_TARGET'] == 'WINNT':
SOURCES += [ 'ThreadPoolCOMListener.cpp' ]
# DecoderTraits.cpp needs to be built separately because of Mac OS X headers.
-# Latency.cpp needs to be built separately because it forces NSPR logging.
SOURCES += [
'DecoderTraits.cpp',
- 'Latency.cpp',
]
FAIL_ON_WARNINGS = True
MSVC_ENABLE_PGO = True
include('/ipc/chromium/chromium-config.mozbuild')
--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -48,31 +48,27 @@ EXPORTS.mozilla += [
'LoadInfo.h',
]
UNIFIED_SOURCES += [
'LoadContext.cpp',
'LoadInfo.cpp',
'nsAboutRedirector.cpp',
'nsDefaultURIFixup.cpp',
+ 'nsDocShell.cpp',
'nsDocShellEditorData.cpp',
'nsDocShellEnumerator.cpp',
'nsDocShellLoadInfo.cpp',
'nsDocShellTransferableHooks.cpp',
'nsDownloadHistory.cpp',
'nsDSURIContentListener.cpp',
'nsWebNavigationInfo.cpp',
'SerializedLoadContext.cpp',
]
-# nsDocShell.cpp cannot be built in unified mode because it forces NSPR logging.
-SOURCES += [
- 'nsDocShell.cpp',
-]
-
FAIL_ON_WARNINGS = True
MSVC_ENABLE_PGO = True
include('/ipc/chromium/chromium-config.mozbuild')
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -89,16 +89,17 @@ UNIFIED_SOURCES += [
'nsDOMClassInfo.cpp',
'nsDOMNavigationTiming.cpp',
'nsDOMScriptObjectFactory.cpp',
'nsDOMWindowList.cpp',
'nsFocusManager.cpp',
'nsGlobalWindowCommands.cpp',
'nsHistory.cpp',
'nsIGlobalObject.cpp',
+ 'nsJSEnvironment.cpp',
'nsJSTimeoutHandler.cpp',
'nsJSUtils.cpp',
'nsLocation.cpp',
'nsMimeTypeArray.cpp',
'nsPerformance.cpp',
'nsQueryContentEventResult.cpp',
'nsScreen.cpp',
'nsScriptNameSpaceManager.cpp',
@@ -118,18 +119,16 @@ UNIFIED_SOURCES += [
# these files couldn't be in UNIFIED_SOURCES for now for reasons given below:
SOURCES += [
# this file doesn't like windows.h
'MessagePort.cpp',
# this file doesn't like windows.h
'nsDOMWindowUtils.cpp',
# This file has a #error "Never include windows.h in this file!"
'nsGlobalWindow.cpp',
- # This file forces NSPR logging.
- 'nsJSEnvironment.cpp',
# nsPluginArray.cpp includes npapi.h indirectly, and that includes a lot of system headers
'nsPluginArray.cpp',
]
EXTRA_COMPONENTS += [
'ConsoleAPI.manifest',
'ConsoleAPIStorage.js',
'SiteSpecificUserAgent.js',
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -58,19 +58,19 @@ UNIFIED_SOURCES += [
'StructuredCloneUtils.cpp',
'TabChild.cpp',
'TabContext.cpp',
'TabMessageUtils.cpp',
'TabParent.cpp',
]
# Blob.cpp cannot be compiled in unified mode because it triggers a fatal gcc warning.
-# ContentChild.cpp cannot be compiled in unified mode because it forces NSPR logging.
# CrashReporterChild.cpp cannot be compiled in unified mode because of name clashes
# in OS X headers.
+# ContentChild.cpp cannot be compiled in unified mode on linux due to Time conflict
SOURCES += [
'Blob.cpp',
'ContentChild.cpp',
'CrashReporterChild.cpp',
]
IPDL_SOURCES += [
'DOMTypes.ipdlh',
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -38,30 +38,29 @@ EXPORTS += [
]
EXPORTS.mozilla += [
'PluginPRLibrary.h',
]
UNIFIED_SOURCES += [
'nsJSNPRuntime.cpp',
+ 'nsNPAPIPluginInstance.cpp',
+ 'nsNPAPIPluginStreamListener.cpp',
'nsPluginInstanceOwner.cpp',
'nsPluginModule.cpp',
'nsPluginPlayPreviewInfo.cpp',
+ 'nsPluginStreamListenerPeer.cpp',
+ 'nsPluginTags.cpp',
'PluginPRLibrary.cpp',
]
-# These files cannot be built in unified mode because they force NSPR logging.
SOURCES += [
- 'nsNPAPIPlugin.cpp',
- 'nsNPAPIPluginInstance.cpp',
- 'nsNPAPIPluginStreamListener.cpp',
- 'nsPluginHost.cpp',
- 'nsPluginStreamListenerPeer.cpp',
- 'nsPluginTags.cpp',
+ 'nsNPAPIPlugin.cpp', # Conflict with X11 headers
+ 'nsPluginHost.cpp', # Conflict with NS_NPAPIPLUGIN_CALLBACK
]
if CONFIG['OS_ARCH'] == 'WINNT':
UNIFIED_SOURCES += [
'nsPluginDirServiceProvider.cpp',
'nsPluginNativeWindowWin.cpp',
'nsPluginsDirWin.cpp',
]
--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@@ -41,68 +41,69 @@ EXPORTS.mozilla.plugins += [
'StreamNotifyChild.h',
'StreamNotifyParent.h',
]
if CONFIG['OS_ARCH'] == 'WINNT':
EXPORTS.mozilla.plugins += [
'PluginSurfaceParent.h',
]
- # These files cannot be built in unified mode because they force NSPR logging.
- SOURCES += [
+ UNIFIED_SOURCES += [
'COMMessageFilter.cpp',
- 'MiniShmParent.cpp',
'PluginHangUIParent.cpp',
'PluginSurfaceParent.cpp',
]
+ SOURCES += [
+ 'MiniShmParent.cpp', # Issues with CreateEvent
+ ]
DEFINES['MOZ_HANGUI_PROCESS_NAME'] = '"plugin-hang-ui%s"' % CONFIG['BIN_SUFFIX']
LOCAL_INCLUDES += [
'/widget/shared',
'hangui',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
EXPORTS.mozilla.plugins += [
'PluginInterposeOSX.h',
]
if CONFIG['MOZ_ENABLE_QT']:
GENERATED_SOURCES += [
'moc_NestedLoopTimer.cpp',
]
- # These files cannot be built in unified mode because they force NSPR logging.
- SOURCES += [
+ UNIFIED_SOURCES += [
'NestedLoopTimer.cpp',
]
-# These files cannot be built in unified mode because they force NSPR logging.
-SOURCES += [
+UNIFIED_SOURCES += [
'BrowserStreamChild.cpp',
'BrowserStreamParent.cpp',
'ChildAsyncCall.cpp',
'ChildTimer.cpp',
'PluginBackgroundDestroyer.cpp',
'PluginIdentifierChild.cpp',
'PluginIdentifierParent.cpp',
- 'PluginInstanceChild.cpp',
'PluginInstanceParent.cpp',
'PluginMessageUtils.cpp',
- 'PluginModuleChild.cpp',
'PluginModuleParent.cpp',
'PluginProcessChild.cpp',
'PluginProcessParent.cpp',
'PluginScriptableObjectChild.cpp',
'PluginScriptableObjectParent.cpp',
'PluginStreamChild.cpp',
'PluginStreamParent.cpp',
]
+SOURCES += [
+ 'PluginInstanceChild.cpp', # 'PluginThreadCallback' : ambiguous symbol
+ 'PluginModuleChild.cpp', # Redefinition of mozilla::WindowsDllInterceptor sUser32Intercept
+]
+
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
- # These files cannot be built in unified mode because they force NSPR logging.
- SOURCES += [
+ UNIFIED_SOURCES += [
'PluginInterposeOSX.mm',
'PluginUtilsOSX.mm',
]
IPDL_SOURCES += [
'PBrowserStream.ipdl',
'PPluginBackgroundDestroyer.ipdl',
'PPluginIdentifier.ipdl',
--- a/extensions/auth/moz.build
+++ b/extensions/auth/moz.build
@@ -1,24 +1,27 @@
# -*- 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/.
+UNIFIED_SOURCES += [
+ 'nsAuthFactory.cpp',
+ 'nsAuthGSSAPI.cpp',
+]
+
SOURCES += [
- 'nsAuthFactory.cpp', # forces NSPR logging
- 'nsAuthGSSAPI.cpp', # forces NSPR logging
'nsAuthSASL.cpp',
'nsHttpNegotiateAuth.cpp', # contains constants whose names conflict with constants in other files
]
if CONFIG['OS_ARCH'] == 'WINNT':
SOURCES += [
'nsAuthSSPI.cpp',
]
DEFINES['USE_SSPI'] = True
else:
- SOURCES += [
- 'nsAuthSambaNTLM.cpp', # forces NSPR logging
+ UNIFIED_SOURCES += [
+ 'nsAuthSambaNTLM.cpp',
]
FINAL_LIBRARY = 'xul'
--- a/extensions/pref/autoconfig/src/moz.build
+++ b/extensions/pref/autoconfig/src/moz.build
@@ -1,15 +1,14 @@
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# These files cannot be built in unified mode because they force NSPR logging.
-SOURCES += [
+UNIFIED_SOURCES += [
'nsAutoConfig.cpp',
'nsConfigFactory.cpp',
'nsJSConfigTriggers.cpp',
'nsReadConfig.cpp',
]
FINAL_LIBRARY = 'xul'
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -164,31 +164,31 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
'gfxGDIFont.h',
'gfxGDIFontList.h',
'gfxPDFSurface.h',
'gfxPlatformFontList.h',
'gfxWindowsNativeDrawing.h',
'gfxWindowsPlatform.h',
'gfxWindowsSurface.h',
]
- # gfxGDIFontList.cpp forces NSPR logging, so it cannot be built in unified mode.
SOURCES += [
'gfxGDIFont.cpp',
'gfxGDIFontList.cpp',
'gfxPDFSurface.cpp',
'gfxWindowsNativeDrawing.cpp',
'gfxWindowsPlatform.cpp',
'gfxWindowsSurface.cpp',
]
if CONFIG['MOZ_ENABLE_DWRITE_FONT']:
- # gfxDWriteFontList.cpp forces NSPR logging, so it cannot be built in unified mode.
+ UNIFIED_SOURCES += [
+ 'gfxDWriteFontList.cpp',
+ ]
SOURCES += [
'gfxD2DSurface.cpp',
'gfxDWriteCommon.cpp',
- 'gfxDWriteFontList.cpp',
'gfxDWriteFonts.cpp',
]
if CONFIG['MOZ_ENABLE_DIRECT2D1_1']:
DEFINES['USE_D2D1_1'] = True
# Are we targeting x86 or x64? If so, build gfxAlphaRecoverySSE2.cpp.
if CONFIG['INTEL_ARCHITECTURE']:
SOURCES += ['gfxAlphaRecoverySSE2.cpp']
@@ -199,66 +199,60 @@ if CONFIG['INTEL_ARCHITECTURE']:
SOURCES += [
# Includes mac system header conflicting with point/size,
# and includes glxXlibSurface.h which drags in Xrender.h
'gfxASurface.cpp',
# on X11, gfxDrawable.cpp includes X headers for an old workaround which
# we could consider removing soon (affects Ubuntus older than 10.04 LTS)
# which currently prevent it from joining UNIFIED_SOURCES.
'gfxDrawable.cpp',
- # Uses FORCE_PR_LOG
- 'gfxFont.cpp',
- # Uses FORCE_PR_LOG
- 'gfxFontEntry.cpp',
- # Uses FORCE_PR_LOG
- 'gfxFontUtils.cpp',
- # Includes mac system header conflicting with point/size, and also uses FORCE_PR_LOG
+ # gfxPlatform.cpp includes mac system header conflicting with point/size
'gfxPlatform.cpp',
- # Uses FORCE_PR_LOG
- 'gfxPlatformFontList.cpp',
'gfxPrefs.cpp',
- # Uses FORCE_PR_LOG
- 'gfxUserFontSet.cpp',
]
UNIFIED_SOURCES += [
'CJKCompatSVS.cpp',
'gfx3DMatrix.cpp',
'gfxAlphaRecovery.cpp',
'gfxBaseSharedMemorySurface.cpp',
'gfxBlur.cpp',
'gfxContext.cpp',
+ 'gfxFont.cpp',
+ 'gfxFontEntry.cpp',
'gfxFontFeatures.cpp',
'gfxFontInfoLoader.cpp',
'gfxFontMissingGlyphs.cpp',
'gfxFontTest.cpp',
+ 'gfxFontUtils.cpp',
'gfxGlyphExtents.cpp',
'gfxGradientCache.cpp',
'gfxGraphiteShaper.cpp',
'gfxHarfBuzzShaper.cpp',
'gfxImageSurface.cpp',
'gfxMathTable.cpp',
'gfxMatrix.cpp',
'gfxPattern.cpp',
+ 'gfxPlatformFontList.cpp',
'gfxRect.cpp',
'gfxReusableImageSurfaceWrapper.cpp',
'gfxReusableSharedImageSurfaceWrapper.cpp',
'gfxScriptItemizer.cpp',
'gfxSkipChars.cpp',
'gfxSVGGlyphs.cpp',
'gfxTeeSurface.cpp',
'gfxTextRun.cpp',
+ 'gfxUserFontSet.cpp',
'gfxUtils.cpp',
'nsSurfaceTexture.cpp',
'nsUnicodeRange.cpp',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
- # gfxMacPlatformFontList.mm forces NSPR logging so it cannot be built in unified mode.
- SOURCES += [
+ UNIFIED_SOURCES += [
'gfxMacPlatformFontList.mm',
]
FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
MSVC_ENABLE_PGO = True
include('/ipc/chromium/chromium-config.mozbuild')
--- a/js/xpconnect/loader/moz.build
+++ b/js/xpconnect/loader/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/.
# These files cannot be built in unified mode because they rely on plarena.h
-# and they want to force NSPR logging.
SOURCES += [
'mozJSComponentLoader.cpp',
'mozJSLoaderUtils.cpp',
'mozJSSubScriptLoader.cpp',
]
EXTRA_JS_MODULES += [
'ISO8601DateUtils.jsm',
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -75,43 +75,41 @@ UNIFIED_SOURCES += [
'nsCaret.cpp',
'nsCounterManager.cpp',
'nsCSSColorUtils.cpp',
'nsCSSFrameConstructor.cpp',
'nsCSSRendering.cpp',
'nsCSSRenderingBorders.cpp',
'nsDisplayList.cpp',
'nsDisplayListInvalidation.cpp',
+ 'nsDocumentViewer.cpp',
'nsFrameManager.cpp',
'nsFrameTraversal.cpp',
'nsGenConList.cpp',
'nsLayoutDebugger.cpp',
'nsLayoutHistoryState.cpp',
'nsLayoutUtils.cpp',
'nsPresContext.cpp',
+ 'nsPresShell.cpp',
'nsQuoteList.cpp',
'nsStyleChangeList.cpp',
'nsStyleSheetService.cpp',
'PaintTracker.cpp',
'PositionedEventTargeting.cpp',
'RestyleManager.cpp',
'RestyleTracker.cpp',
'SelectionCarets.cpp',
'StackArena.cpp',
'TouchCaret.cpp',
]
-# nsDocumentViewer.cpp and nsPresShell.cpp need to be built separately
-# because they force NSPR logging.
# nsPresArena.cpp needs to be built separately because it uses plarena.h.
# nsRefreshDriver.cpp needs to be built separately because of name clashes in the OS X headers
SOURCES += [
- 'nsDocumentViewer.cpp',
'nsPresArena.cpp',
- 'nsPresShell.cpp',
'nsRefreshDriver.cpp',
]
FAIL_ON_WARNINGS = True
MSVC_ENABLE_PGO = True
include('/ipc/chromium/chromium-config.mozbuild')
--- a/layout/printing/moz.build
+++ b/layout/printing/moz.build
@@ -9,26 +9,22 @@ XPIDL_SOURCES += [
'nsIPrintProgressParams.idl',
'nsIPrintStatusFeedback.idl',
]
XPIDL_MODULE = 'layout_printing'
UNIFIED_SOURCES += [
'nsPagePrintTimer.cpp',
+ 'nsPrintData.cpp',
+ 'nsPrintEngine.cpp',
'nsPrintObject.cpp',
'nsPrintPreviewListener.cpp',
]
-# These files cannot be built in unified mode because they force NSPR logging.
-SOURCES += [
- 'nsPrintData.cpp',
- 'nsPrintEngine.cpp',
-]
-
FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'../../content/base/src',
'../base',
]
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -112,16 +112,17 @@ UNIFIED_SOURCES += [
'nsCSSRules.cpp',
'nsCSSScanner.cpp',
'nsCSSValue.cpp',
'nsDOMCSSAttrDeclaration.cpp',
'nsDOMCSSDeclaration.cpp',
'nsDOMCSSRect.cpp',
'nsDOMCSSRGBColor.cpp',
'nsDOMCSSValueList.cpp',
+ 'nsFontFaceLoader.cpp',
'nsHTMLCSSStyleSheet.cpp',
'nsHTMLStyleSheet.cpp',
'nsLayoutStylesheetCache.cpp',
'nsMediaFeatures.cpp',
'nsNthIndexCache.cpp',
'nsROCSSPrimitiveValue.cpp',
'nsRuleData.cpp',
'nsRuleNode.cpp',
@@ -132,23 +133,21 @@ UNIFIED_SOURCES += [
'nsStyleTransformMatrix.cpp',
'nsStyleUtil.cpp',
'nsTransitionManager.cpp',
'StyleAnimationValue.cpp',
'StyleRule.cpp',
'SVGAttrAnimationRuleProcessor.cpp',
]
+# FontFaceSet.cpp needs to be built separately because it redefines LOG.
# nsCSSRuleProcessor.cpp needs to be built separately because it uses plarena.h.
-# FontFaceSet.cpp and nsFontFaceLoader.cpp need to be built separately because
-# they force NSPR logging.
SOURCES += [
'FontFaceSet.cpp',
'nsCSSRuleProcessor.cpp',
- 'nsFontFaceLoader.cpp',
]
FAIL_ON_WARNINGS = True
MSVC_ENABLE_PGO = True
include('/ipc/chromium/chromium-config.mozbuild')
--- a/media/mtransport/build/moz.build
+++ b/media/mtransport/build/moz.build
@@ -22,17 +22,19 @@ EXPORTS.mtransport += [
'../transportlayerice.h',
'../transportlayerlog.h',
'../transportlayerloopback.h',
'../transportlayerprsock.h',
]
include('../objs.mozbuild')
-# These files cannot be built in unified mode because they force NSPR logging.
+# These files cannot be built in unified mode because of the redefinition of
+# getLogModule, UNIMPLEMENTED, nr_socket_long_term_violation_time,
+# nr_socket_short_term_violation_time.
SOURCES += mtransport_cppsrcs
FAIL_ON_WARNINGS = True
LOCAL_INCLUDES += [
'/media/mtransport/',
'/media/mtransport/third_party/',
'/media/mtransport/third_party/nICEr/src/crypto',
--- a/media/mtransport/standalone/moz.build
+++ b/media/mtransport/standalone/moz.build
@@ -1,17 +1,19 @@
# -*- 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/.
include('../objs.mozbuild')
-# These files cannot be built in unified mode because they force NSPR logging.
+# These files cannot be built in unified mode because of the redefinition of
+# getLogModule, UNIMPLEMENTED, nr_socket_long_term_violation_time,
+# nr_socket_short_term_violation_time.
SOURCES += mtransport_cppsrcs
Library('mtransport_s')
LOCAL_INCLUDES += [
'/media/mtransport/',
'/media/mtransport/third_party/',
'/media/mtransport/third_party/nICEr/src/crypto',
--- a/netwerk/base/src/moz.build
+++ b/netwerk/base/src/moz.build
@@ -24,16 +24,17 @@ UNIFIED_SOURCES += [
'ArrayBufferInputStream.cpp',
'BackgroundFileSaver.cpp',
'ChannelDiverterChild.cpp',
'ChannelDiverterParent.cpp',
'Dashboard.cpp',
'EventTokenBucket.cpp',
'LoadContextInfo.cpp',
'NetworkActivityMonitor.cpp',
+ 'nsAsyncRedirectVerifyHelper.cpp',
'nsAsyncStreamCopier.cpp',
'nsAuthInformationHolder.cpp',
'nsBase64Encoder.cpp',
'nsBaseChannel.cpp',
'nsBaseContentStream.cpp',
'nsBufferedStreams.cpp',
'nsChannelClassifier.cpp',
'nsDirectoryIndexStream.cpp',
@@ -55,45 +56,40 @@ UNIFIED_SOURCES += [
'nsProtocolProxyService.cpp',
'nsProxyInfo.cpp',
'nsRequestObserverProxy.cpp',
'nsSerializationHelper.cpp',
'nsServerSocket.cpp',
'nsSimpleNestedURI.cpp',
'nsSimpleStreamListener.cpp',
'nsSimpleURI.cpp',
+ 'nsSocketTransport2.cpp',
+ 'nsSocketTransportService2.cpp',
'nsStandardURL.cpp',
'nsStreamListenerTee.cpp',
'nsStreamListenerWrapper.cpp',
'nsStreamLoader.cpp',
'nsStreamTransportService.cpp',
'nsSyncStreamListener.cpp',
'nsTemporaryFileInputStream.cpp',
'nsTransportUtils.cpp',
'nsUDPSocket.cpp',
'nsUnicharStreamLoader.cpp',
'nsURIChecker.cpp',
'nsURLHelper.cpp',
'nsURLParsers.cpp',
+ 'OfflineObserver.cpp',
'Predictor.cpp',
'ProxyAutoConfig.cpp',
'RedirectChannelRegistrar.cpp',
'StreamingProtocolService.cpp',
'Tickler.cpp',
'TLSServerSocket.cpp',
]
-# These files cannot be built in unified mode because they force NSPR logging.
-SOURCES += [
- 'nsAsyncRedirectVerifyHelper.cpp',
- 'nsSocketTransport2.cpp',
- 'nsSocketTransportService2.cpp',
- 'OfflineObserver.cpp',
-]
-
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
SOURCES += [
'nsAutodialWin.cpp',
'nsNativeConnectionHelper.cpp',
'nsURLHelperWin.cpp',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
SOURCES += [
--- a/netwerk/cache/moz.build
+++ b/netwerk/cache/moz.build
@@ -16,18 +16,17 @@ XPIDL_SOURCES += [
XPIDL_MODULE = 'necko_cache'
EXPORTS += [
'nsApplicationCacheService.h',
'nsCacheService.h',
'nsDeleteDir.h'
]
-# These files cannot be built in unified mode because they force NSPR logging.
-SOURCES += [
+UNIFIED_SOURCES += [
'nsApplicationCacheService.cpp',
'nsCache.cpp',
'nsCacheEntry.cpp',
'nsCacheEntryDescriptor.cpp',
'nsCacheMetaData.cpp',
'nsCacheService.cpp',
'nsCacheSession.cpp',
'nsCacheUtils.cpp',
--- a/netwerk/cookie/moz.build
+++ b/netwerk/cookie/moz.build
@@ -23,17 +23,17 @@ if CONFIG['NECKO_COOKIES']:
'CookieServiceChild.h',
'CookieServiceParent.h',
]
UNIFIED_SOURCES += [
'CookieServiceChild.cpp',
'CookieServiceParent.cpp',
'nsCookie.cpp',
]
- # nsCookieService.cpp can't be unified because it forces NSPR logging.
+ # nsCookieService.cpp can't be unified because of symbol conflicts
SOURCES += [
'nsCookieService.cpp',
]
LOCAL_INCLUDES += [
'/intl/uconv',
]
XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@@ -20,27 +20,27 @@ EXPORTS.mozilla.net += [
'DNS.h',
'DNSListenerProxy.h',
'DNSRequestChild.h',
'DNSRequestParent.h',
'PDNSParams.h',
]
SOURCES += [
- 'GetAddrInfo.cpp', # Excluded from UNIFIED_SOURCES due to NSPR forced logging.
'nsEffectiveTLDService.cpp', # Excluded from UNIFIED_SOURCES due to special build flags.
- 'nsHostResolver.cpp', # Excluded from UNIFIED_SOURCES due to NSPR forced logging.
+ 'nsHostResolver.cpp', # Redefines LOG
]
UNIFIED_SOURCES += [
'ChildDNSService.cpp',
'DNS.cpp',
'DNSListenerProxy.cpp',
'DNSRequestChild.cpp',
'DNSRequestParent.cpp',
+ 'GetAddrInfo.cpp',
'nameprep.c',
'nsDNSService2.cpp',
'nsIDNService.cpp',
'punycode.c',
'race.c',
]
IPDL_SOURCES = [
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -34,37 +34,38 @@ EXPORTS.mozilla.net += [
'HttpInfo.h',
'PHttpChannelParams.h',
'PSpdyPush.h',
'TimingStruct.h',
]
# ASpdySession.cpp and nsHttpAuthCache cannot be built in unified mode because
# they use plarena.h.
-# The rest of these files cannot be built in unified mode because they want to
-# force NSPR logging.
SOURCES += [
'ASpdySession.cpp',
+ 'nsHttpAuthCache.cpp',
+ 'nsHttpChannelAuthProvider.cpp', # redefines GetAuthType
+]
+
+UNIFIED_SOURCES += [
'ConnectionDiagnostics.cpp',
'Http2Compression.cpp',
'Http2Push.cpp',
'Http2Session.cpp',
'Http2Stream.cpp',
'HttpBaseChannel.cpp',
'HttpChannelChild.cpp',
'HttpChannelParent.cpp',
'HttpChannelParentListener.cpp',
'HttpInfo.cpp',
'nsHttp.cpp',
'nsHttpActivityDistributor.cpp',
- 'nsHttpAuthCache.cpp',
'nsHttpAuthManager.cpp',
'nsHttpBasicAuth.cpp',
'nsHttpChannel.cpp',
- 'nsHttpChannelAuthProvider.cpp',
'nsHttpChunkedDecoder.cpp',
'nsHttpConnection.cpp',
'nsHttpConnectionInfo.cpp',
'nsHttpConnectionMgr.cpp',
'nsHttpDigestAuth.cpp',
'nsHttpHeaderArray.cpp',
'nsHttpNTLMAuth.cpp',
'nsHttpPipeline.cpp',
--- a/netwerk/protocol/rtsp/moz.build
+++ b/netwerk/protocol/rtsp/moz.build
@@ -9,18 +9,17 @@ EXPORTS.mozilla.net += [
'controller/RtspControllerParent.h',
'controller/RtspMetaData.h',
'rtsp/RTSPSource.h',
'RtspChannelChild.h',
'RtspChannelParent.h',
'RtspHandler.h',
]
-# These files cannot be built in unified mode because they force NSPR logging.
-SOURCES += [
+UNIFIED_SOURCES += [
'controller/RtspController.cpp',
'controller/RtspControllerChild.cpp',
'controller/RtspControllerParent.cpp',
'controller/RtspMetaData.cpp',
'RtspChannelChild.cpp',
'RtspChannelParent.cpp',
'RtspHandler.cpp',
]
--- a/security/apps/moz.build
+++ b/security/apps/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/.
-# These cannot be built in unified mode because they force NSPR logging.
-SOURCES += [
+UNIFIED_SOURCES += [
'AppSignatureVerification.cpp',
'AppTrustDomain.cpp',
]
FAIL_ON_WARNINGS = True
FINAL_LIBRARY = 'xul'
--- a/security/manager/boot/src/moz.build
+++ b/security/manager/boot/src/moz.build
@@ -7,28 +7,23 @@
EXPORTS.mozilla += [
'DataStorage.h',
]
UNIFIED_SOURCES += [
'DataStorage.cpp',
'nsBOOTModule.cpp',
'nsEntropyCollector.cpp',
+ 'nsSecureBrowserUIImpl.cpp',
'nsSecurityHeaderParser.cpp',
'nsSecurityWarningDialogs.cpp',
'nsSiteSecurityService.cpp',
'PublicKeyPinningService.cpp',
]
-# nsSecureBrowserUIImpl.cpp cannot be built in unified mode because it forces NSPR logging.
-SOURCES += [
- 'nsSecureBrowserUIImpl.cpp',
-]
-
-
LOCAL_INCLUDES += [
'../../../pkix/include',
]
FAIL_ON_WARNINGS = True
MSVC_ENABLE_PGO = True
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@@ -46,39 +46,32 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
]]
EXPORTS.mozilla.dom += [
'ExternalHelperAppChild.h',
'ExternalHelperAppParent.h',
]
UNIFIED_SOURCES += [
+ 'ExternalHelperAppChild.cpp',
'ExternalHelperAppParent.cpp',
+ 'nsExternalHelperAppService.cpp',
+ 'nsExternalProtocolHandler.cpp',
'nsLocalHandlerApp.cpp',
'nsMIMEInfoImpl.cpp',
]
-# These files can't be built in unified mode because they force NSPR logging.
-SOURCES += [
- 'ExternalHelperAppChild.cpp',
- 'nsExternalHelperAppService.cpp',
- 'nsExternalProtocolHandler.cpp',
-]
-
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
UNIFIED_SOURCES += [
'mac/nsLocalHandlerAppMac.mm',
'mac/nsMIMEInfoMac.mm',
- ]
- # These files can't be built in unified mode because they force NSPR logging.
- SOURCES += [
'mac/nsOSHelperAppService.mm',
]
else:
- # These files can't be built in unified mode because they force NSPR logging.
+ # These files can't be built in unified mode because they redefine LOG.
SOURCES += [
osdir + '/nsOSHelperAppService.cpp',
]
if CONFIG['MOZ_ENABLE_GTK']:
UNIFIED_SOURCES += [
'unix/nsGNOMERegistry.cpp',
'unix/nsMIMEInfoUnix.cpp',
@@ -91,18 +84,17 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'an
'android/nsMIMEInfoAndroid.cpp',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
UNIFIED_SOURCES += [
'unix/nsGNOMERegistry.cpp',
'unix/nsMIMEInfoUnix.cpp',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
- # These files can't be built in unified mode because they force NSPR logging.
- SOURCES += [
+ UNIFIED_SOURCES += [
'win/nsMIMEInfoWin.cpp',
]
if CONFIG['MOZ_ENABLE_DBUS']:
UNIFIED_SOURCES += [
'nsDBusHandlerApp.cpp',
]
--- a/uriloader/prefetch/moz.build
+++ b/uriloader/prefetch/moz.build
@@ -16,28 +16,24 @@ EXPORTS += [
]
EXPORTS.mozilla.docshell += [
'OfflineCacheUpdateChild.h',
'OfflineCacheUpdateParent.h',
]
UNIFIED_SOURCES += [
+ 'nsOfflineCacheUpdate.cpp',
+ 'nsOfflineCacheUpdateService.cpp',
'nsPrefetchService.cpp',
'OfflineCacheUpdateChild.cpp',
'OfflineCacheUpdateGlue.cpp',
'OfflineCacheUpdateParent.cpp',
]
-# These files can't be built in unified mode because they force NSPR logging.
-SOURCES += [
- 'nsOfflineCacheUpdate.cpp',
- 'nsOfflineCacheUpdateService.cpp',
-]
-
IPDL_SOURCES += [
'POfflineCacheUpdate.ipdl',
]
FAIL_ON_WARNINGS = True
include('/ipc/chromium/chromium-config.mozbuild')
--- a/widget/cocoa/moz.build
+++ b/widget/cocoa/moz.build
@@ -23,16 +23,17 @@ UNIFIED_SOURCES += [
'nsAppShell.mm',
'nsBidiKeyboard.mm',
'nsCocoaFeatures.mm',
'nsCocoaUtils.mm',
'nsCocoaWindow.mm',
'nsColorPicker.mm',
'nsCursorManager.mm',
'nsDeviceContextSpecX.mm',
+ 'nsDragService.mm',
'nsFilePicker.mm',
'nsIdleServiceX.mm',
'nsLookAndFeel.mm',
'nsMacCursor.mm',
'nsMacDockSupport.mm',
'nsMacWebAppUtils.mm',
'nsMenuBarX.mm',
'nsMenuGroupOwnerX.mm',
@@ -48,26 +49,25 @@ UNIFIED_SOURCES += [
'nsScreenManagerCocoa.mm',
'nsSound.mm',
'nsStandaloneNativeMenu.mm',
'nsSystemStatusBarCocoa.mm',
'nsToolkit.mm',
'nsWidgetFactory.mm',
'nsWindowMap.mm',
'OSXNotificationCenter.mm',
+ 'TextInputHandler.mm',
'VibrancyManager.mm',
'WidgetTraceEvent.mm',
]
-# These files cannot be built in unified mode because they force NSPR logging.
+# These files cannot be built in unified mode because they cause symbol conflicts
SOURCES += [
'nsChildView.mm',
'nsClipboard.mm',
- 'nsDragService.mm',
- 'TextInputHandler.mm',
]
if CONFIG['TARGET_CPU'] == 'x86_64':
UNIFIED_SOURCES += [
'ComplexTextInputPanel.mm',
]
include('/ipc/chromium/chromium-config.mozbuild')
--- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build
@@ -11,64 +11,57 @@ EXPORTS += [
'mozcontainer.h',
'nsGTKToolkit.h',
'nsIImageToPixbuf.h',
]
UNIFIED_SOURCES += [
'mozcontainer.c',
'NativeKeyBindings.cpp',
+ 'nsAppShell.cpp',
'nsBidiKeyboard.cpp',
'nsColorPicker.cpp',
'nsFilePicker.cpp',
+ 'nsGtkIMModule.cpp',
'nsGtkKeyUtils.cpp',
'nsImageToPixbuf.cpp',
'nsLookAndFeel.cpp',
'nsNativeThemeGTK.cpp',
'nsScreenGtk.cpp',
'nsScreenManagerGtk.cpp',
'nsSound.cpp',
'nsToolkit.cpp',
+ 'nsWidgetFactory.cpp',
'WakeLockListener.cpp',
'WidgetTraceEvent.cpp',
]
-# These files force-enable NSPR logging and thus cannot be built in unified mode
SOURCES += [
- 'nsAppShell.cpp',
- 'nsGtkIMModule.cpp',
- 'nsWidgetFactory.cpp',
- 'nsWindow.cpp',
+ 'nsWindow.cpp', # conflicts with X11 headers
]
if CONFIG['MOZ_X11']:
UNIFIED_SOURCES += [
'nsIdleServiceGTK.cpp',
]
if CONFIG['NS_PRINTING']:
UNIFIED_SOURCES += [
'nsCUPSShim.cpp',
+ 'nsDeviceContextSpecG.cpp',
'nsPaperPS.cpp',
'nsPrintDialogGTK.cpp',
'nsPrintOptionsGTK.cpp',
'nsPrintSettingsGTK.cpp',
'nsPSPrinters.cpp',
]
- # This file force-enables NSPR logging and thus cannot be built in unified mode
- SOURCES += [
- 'nsDeviceContextSpecG.cpp',
- ]
if CONFIG['MOZ_X11']:
UNIFIED_SOURCES += [
'nsClipboard.cpp',
- ]
- # This file force-enables NSPR logging and thus cannot be built in unified mode
- SOURCES += [
'nsDragService.cpp',
]
FAIL_ON_WARNINGS = True
if CONFIG['ACCESSIBILITY']:
UNIFIED_SOURCES += [
'maiRedundantObjectFactory.c',
--- a/widget/windows/moz.build
+++ b/widget/windows/moz.build
@@ -19,24 +19,26 @@ EXPORTS.mozilla.widget += [
'AudioSession.h',
]
UNIFIED_SOURCES += [
'AudioSession.cpp',
'GfxInfo.cpp',
'IEnumFE.cpp',
'JumpListItem.cpp',
+ 'KeyboardLayout.cpp',
'nsAppShell.cpp',
'nsClipboard.cpp',
'nsColorPicker.cpp',
'nsDataObj.cpp',
'nsDataObjCollection.cpp',
'nsDragService.cpp',
'nsIdleServiceWin.cpp',
'nsImageClipboard.cpp',
+ 'nsIMM32Handler.cpp',
'nsLookAndFeel.cpp',
'nsNativeDragSource.cpp',
'nsNativeDragTarget.cpp',
'nsNativeThemeWin.cpp',
'nsScreenManagerWin.cpp',
'nsScreenWin.cpp',
'nsSound.cpp',
'nsToolkit.cpp',
@@ -49,32 +51,26 @@ UNIFIED_SOURCES += [
'TaskbarPreview.cpp',
'TaskbarPreviewButton.cpp',
'TaskbarTabPreview.cpp',
'TaskbarWindowPreview.cpp',
'WidgetTraceEvent.cpp',
'WindowHook.cpp',
'WinIMEHandler.cpp',
'WinTaskbar.cpp',
-]
-
-# The following files cannot be built in unified mode because they force NSPR logging.
-SOURCES += [
- 'KeyboardLayout.cpp',
- 'nsIMM32Handler.cpp',
- 'WinMouseScrollHandler.cpp',
'WinUtils.cpp',
]
# The following files cannot be built in unified mode because of name clashes.
SOURCES += [
'JumpListBuilder.cpp',
'nsBidiKeyboard.cpp',
'nsFilePicker.cpp',
'nsWidgetFactory.cpp',
+ 'WinMouseScrollHandler.cpp',
]
if CONFIG['MOZ_CRASHREPORTER']:
UNIFIED_SOURCES += [
'LSPAnnotator.cpp',
]
if CONFIG['NS_PRINTING']:
--- a/xpcom/components/moz.build
+++ b/xpcom/components/moz.build
@@ -24,22 +24,23 @@ EXPORTS.mozilla += [
'Module.h',
'ModuleLoader.h',
'ModuleUtils.h',
]
# nsCategoryManager.cpp and nsComponentManager.cpp cannot be built in
# unified mode because they use thea PL_ARENA_CONST_ALIGN_MASK macro
# with plarena.h.
-# nsNativeModuleLoader.cpp cannot be built in unified mode because it
-# forces NSPR logging.
SOURCES += [
- 'ManifestParser.cpp',
'nsCategoryManager.cpp',
'nsComponentManager.cpp',
+]
+
+UNIFIED_SOURCES += [
+ 'ManifestParser.cpp',
'nsNativeModuleLoader.cpp',
]
FAIL_ON_WARNINGS = True
MSVC_ENABLE_PGO = True
FINAL_LIBRARY = 'xul'