Issue #80 - reinstated unified building for some large chunks of our code.

This should reduce compile complexity saving time and reducing linker stress.

21 files changed, 58 insertions, 37 deletions

diff --git a/netwerk/base/moz.build b/netwerk/base/moz.build
index 1659299f7b..78482d87fa 100644
--- a/netwerk/base/moz.build
+++ b/netwerk/base/moz.build
@@ -181,7 +181,7 @@ EXPORTS.mozilla.net += [
     'ReferrerPolicy.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'ArrayBufferInputStream.cpp',
     'BackgroundFileSaver.cpp',
     'CaptivePortalService.cpp',
diff --git a/netwerk/cache/moz.build b/netwerk/cache/moz.build
index 32dddc1bab..03810fc288 100644
--- a/netwerk/cache/moz.build
+++ b/netwerk/cache/moz.build
@@ -20,7 +20,7 @@ EXPORTS += [
     'nsDeleteDir.h'
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsApplicationCacheService.cpp',
     'nsCache.cpp',
     'nsCacheEntry.cpp',
diff --git a/netwerk/cache/nsApplicationCacheService.cpp b/netwerk/cache/nsApplicationCacheService.cpp
index 17012518d4..c512b91695 100644
--- a/netwerk/cache/nsApplicationCacheService.cpp
+++ b/netwerk/cache/nsApplicationCacheService.cpp
@@ -16,8 +16,6 @@
 
 using namespace mozilla;
 
-static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID);
-
 //-----------------------------------------------------------------------------
 // nsApplicationCacheService
 //-----------------------------------------------------------------------------
diff --git a/netwerk/cache/nsDiskCacheDeviceSQL.cpp b/netwerk/cache/nsDiskCacheDeviceSQL.cpp
index 297c0f362a..86ace05f7e 100644
--- a/netwerk/cache/nsDiskCacheDeviceSQL.cpp
+++ b/netwerk/cache/nsDiskCacheDeviceSQL.cpp
@@ -17,8 +17,6 @@
 #include "nsCacheService.h"
 #include "nsApplicationCache.h"
 
-#include "nsNetCID.h"
-#include "nsNetUtil.h"
 #include "nsIURI.h"
 #include "nsAutoPtr.h"
 #include "nsEscape.h"
@@ -55,7 +53,6 @@ using namespace mozilla::storage;
 using mozilla::NeckoOriginAttributes;
 
 static const char OFFLINE_CACHE_DEVICE_ID[] = { "offline" };
-static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID);
 
 #define LOG(args) CACHE_LOG_DEBUG(args)
 
diff --git a/netwerk/cache/nsDiskCacheDeviceSQL.h b/netwerk/cache/nsDiskCacheDeviceSQL.h
index fcde58d3d7..f6f8db2c7b 100644
--- a/netwerk/cache/nsDiskCacheDeviceSQL.h
+++ b/netwerk/cache/nsDiskCacheDeviceSQL.h
@@ -21,6 +21,10 @@
 #include "nsWeakReference.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Mutex.h"
+#include "nsNetCID.h"
+#include "nsNetUtil.h"
+
+static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID);
 
 class nsIURI;
 class nsOfflineCacheDevice;
diff --git a/netwerk/cache2/moz.build b/netwerk/cache2/moz.build
index bc8dd0e426..90473a1d29 100644
--- a/netwerk/cache2/moz.build
+++ b/netwerk/cache2/moz.build
@@ -20,8 +20,7 @@ EXPORTS += [
     'CacheStorageService.h',
 ]
 
-SOURCES += [
-    'AppCacheStorage.cpp',
+UNIFIED_SOURCES += [
     'CacheEntry.cpp',
     'CacheFile.cpp',
     'CacheFileChunk.cpp',
@@ -43,6 +42,11 @@ SOURCES += [
     'OldWrappers.cpp',
 ]
 
+# AppCacheStorage.cpp cannot be built in unified mode because it uses plarena.h.
+SOURCES += [
+    'AppCacheStorage.cpp',
+]
+
 LOCAL_INCLUDES += [
     '/netwerk/base',
     '/netwerk/cache',
diff --git a/netwerk/cookie/moz.build b/netwerk/cookie/moz.build
index 2057950508..78e9333774 100644
--- a/netwerk/cookie/moz.build
+++ b/netwerk/cookie/moz.build
@@ -20,10 +20,13 @@ if CONFIG['NECKO_COOKIES']:
         'CookieServiceChild.h',
         'CookieServiceParent.h',
     ]
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'CookieServiceChild.cpp',
         'CookieServiceParent.cpp',
         'nsCookie.cpp',
+    ]
+    # nsCookieService.cpp can't be unified because of symbol conflicts
+    SOURCES += [
         'nsCookieService.cpp',
     ]
     LOCAL_INCLUDES += [
diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build
index 06ee6c8084..005b314f8d 100644
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@@ -28,6 +28,11 @@ EXPORTS.mozilla.net += [
 ]
 
 SOURCES += [
+    'nsEffectiveTLDService.cpp', # Excluded from UNIFIED_SOURCES due to special build flags.
+    'nsHostResolver.cpp', # Redefines LOG
+]
+
+UNIFIED_SOURCES += [
     'ChildDNSService.cpp',
     'DNS.cpp',
     'DNSListenerProxy.cpp',
@@ -35,8 +40,6 @@ SOURCES += [
     'DNSRequestParent.cpp',
     'GetAddrInfo.cpp',
     'nsDNSService2.cpp',
-    'nsEffectiveTLDService.cpp',
-    'nsHostResolver.cpp',
     'nsIDNService.cpp',
     'punycode.c',
 ]
diff --git a/netwerk/ipc/moz.build b/netwerk/ipc/moz.build
index 8571579f88..8d8bc7cb91 100644
--- a/netwerk/ipc/moz.build
+++ b/netwerk/ipc/moz.build
@@ -11,7 +11,7 @@ EXPORTS.mozilla.net += [
     'NeckoParent.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'ChannelEventQueue.cpp',
     'NeckoChild.cpp',
     'NeckoCommon.cpp',
diff --git a/netwerk/protocol/data/moz.build b/netwerk/protocol/data/moz.build
index 0d5d27d429..54b76f8856 100644
--- a/netwerk/protocol/data/moz.build
+++ b/netwerk/protocol/data/moz.build
@@ -7,7 +7,7 @@ EXPORTS.mozilla.net += [
     'DataChannelParent.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'DataChannelChild.cpp',
     'DataChannelParent.cpp',
     'nsDataChannel.cpp',
diff --git a/netwerk/protocol/device/moz.build b/netwerk/protocol/device/moz.build
index 2a52c9e5f0..37d6695bdb 100644
--- a/netwerk/protocol/device/moz.build
+++ b/netwerk/protocol/device/moz.build
@@ -3,7 +3,7 @@
 # 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 += [
+UNIFIED_SOURCES += [
     'nsDeviceChannel.cpp',
     'nsDeviceProtocolHandler.cpp',
 ]
diff --git a/netwerk/protocol/file/moz.build b/netwerk/protocol/file/moz.build
index ebfb4bd690..c58c033af1 100644
--- a/netwerk/protocol/file/moz.build
+++ b/netwerk/protocol/file/moz.build
@@ -14,7 +14,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_file'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsFileChannel.cpp',
     'nsFileProtocolHandler.cpp',
 ]
diff --git a/netwerk/protocol/ftp/moz.build b/netwerk/protocol/ftp/moz.build
index a192ab40ce..18c7f0fdb7 100644
--- a/netwerk/protocol/ftp/moz.build
+++ b/netwerk/protocol/ftp/moz.build
@@ -19,7 +19,7 @@ EXPORTS.mozilla.net += [
     'FTPChannelParent.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'FTPChannelChild.cpp',
     'FTPChannelParent.cpp',
     'nsFTPChannel.cpp',
diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build
index cf006a8c63..91fc897224 100644
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -42,11 +42,18 @@ EXPORTS.mozilla.net += [
     'TimingStruct.h',
 ]
 
+# ASpdySession.cpp and nsHttpAuthCache cannot be built in unified mode because
+# they use plarena.h.
 SOURCES += [
-    'AltDataOutputStreamChild.cpp',
-    'AltDataOutputStreamParent.cpp',
     'AlternateServices.cpp',
     'ASpdySession.cpp',
+    'nsHttpAuthCache.cpp',
+    'nsHttpChannelAuthProvider.cpp', # redefines GetAuthType
+]
+
+UNIFIED_SOURCES += [
+    'AltDataOutputStreamChild.cpp',
+    'AltDataOutputStreamParent.cpp',
     'CacheControlParser.cpp',
     'ConnectionDiagnostics.cpp',
     'Http2Compression.cpp',
@@ -62,17 +69,14 @@ SOURCES += [
     'nsCORSListenerProxy.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',
-    'nsHttpHandler.cpp',
     'nsHttpHeaderArray.cpp',
     'nsHttpNTLMAuth.cpp',
     'nsHttpPipeline.cpp',
@@ -84,6 +88,11 @@ SOURCES += [
     'TunnelUtils.cpp',
 ]
 
+# These files cannot be built in unified mode because of OS X headers.
+SOURCES += [
+    'nsHttpHandler.cpp',
+]
+
 IPDL_SOURCES += [
     'PAltDataOutputStream.ipdl',
     'PHttpChannel.ipdl',
diff --git a/netwerk/protocol/res/moz.build b/netwerk/protocol/res/moz.build
index 0d8f7e8ccb..79051cdb44 100644
--- a/netwerk/protocol/res/moz.build
+++ b/netwerk/protocol/res/moz.build
@@ -10,7 +10,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_res'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'ExtensionProtocolHandler.cpp',
     'nsResProtocolHandler.cpp',
     'SubstitutingProtocolHandler.cpp',
diff --git a/netwerk/protocol/viewsource/moz.build b/netwerk/protocol/viewsource/moz.build
index 3cd326f8ae..0422e3c60a 100644
--- a/netwerk/protocol/viewsource/moz.build
+++ b/netwerk/protocol/viewsource/moz.build
@@ -9,7 +9,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_viewsource'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsViewSourceChannel.cpp',
     'nsViewSourceHandler.cpp',
 ]
diff --git a/netwerk/protocol/wyciwyg/moz.build b/netwerk/protocol/wyciwyg/moz.build
index 47f5f01374..a9a6bdb90b 100644
--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@@ -14,7 +14,7 @@ EXPORTS.mozilla.net += [
     'WyciwygChannelParent.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsWyciwyg.cpp',
     'nsWyciwygChannel.cpp',
     'nsWyciwygProtocolHandler.cpp',
diff --git a/netwerk/socket/moz.build b/netwerk/socket/moz.build
index c539a96dbb..6f7525f401 100644
--- a/netwerk/socket/moz.build
+++ b/netwerk/socket/moz.build
@@ -17,7 +17,7 @@ LOCAL_INCLUDES += [
     '/netwerk/base',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsSocketProviderService.cpp',
     'nsSOCKSIOLayer.cpp',
     'nsSOCKSSocketProvider.cpp',
@@ -28,7 +28,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     XPIDL_SOURCES += [
         'nsINamedPipeService.idl',
     ]
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'nsNamedPipeIOLayer.cpp',
         'nsNamedPipeService.cpp'
     ]
diff --git a/netwerk/srtp/src/moz.build b/netwerk/srtp/src/moz.build
index 29bf0addae..4b5e4311a5 100644
--- a/netwerk/srtp/src/moz.build
+++ b/netwerk/srtp/src/moz.build
@@ -3,7 +3,7 @@
 # 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 += [
+UNIFIED_SOURCES += [
     'crypto/cipher/aes.c',
     'crypto/cipher/aes_cbc.c',
     'crypto/cipher/aes_icm.c',
diff --git a/netwerk/streamconv/converters/moz.build b/netwerk/streamconv/converters/moz.build
index 8630922404..22f544e4c4 100644
--- a/netwerk/streamconv/converters/moz.build
+++ b/netwerk/streamconv/converters/moz.build
@@ -9,7 +9,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_http'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'mozTXTToHTMLConv.cpp',
     'nsDirIndex.cpp',
     'nsDirIndexParser.cpp',
@@ -21,13 +21,13 @@ SOURCES += [
 ]
 
 if 'ftp' in CONFIG['NECKO_PROTOCOLS']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'nsFTPDirListingConv.cpp',
         'ParseFTPList.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'cocoa':
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'nsBinHexDecoder.cpp',
     ]
 
diff --git a/netwerk/wifi/moz.build b/netwerk/wifi/moz.build
index 9d38dcc447..fc30584a03 100644
--- a/netwerk/wifi/moz.build
+++ b/netwerk/wifi/moz.build
@@ -11,13 +11,16 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_wifi'
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'nsWifiAccessPoint.cpp',
+]
+
+UNIFIED_SOURCES += [
     'nsWifiMonitor.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'Darwin':
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'nsWifiScannerMac.cpp',
     ]
     SOURCES += [
@@ -28,23 +31,23 @@ if CONFIG['OS_ARCH'] == 'Darwin':
     # to accept the warnings when targeting the newer SDKs.
     SOURCES['osx_corewlan.mm'].flags += ['-Wno-error=objc-method-access']
 elif CONFIG['OS_ARCH'] in ('DragonFly', 'FreeBSD'):
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'nsWifiScannerFreeBSD.cpp',
     ]
 elif CONFIG['OS_ARCH'] == 'WINNT':
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'nsWifiScannerWin.cpp',
         'win_wifiScanner.cpp',
         'win_wlanLibrary.cpp',
     ]
 elif CONFIG['OS_ARCH'] == 'SunOS':
     CXXFLAGS += CONFIG['GLIB_CFLAGS']
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'nsWifiScannerSolaris.cpp',
     ]
 
 if CONFIG['NECKO_WIFI_DBUS']:
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'nsWifiScannerDBus.cpp',
     ]
     CXXFLAGS += ['-Wno-error=shadow']