Bug 940194 - Build netwerk/cookie in unified mode. r=ehsan
authorChris Peterson <cpeterson@mozilla.com>
Mon, 02 Dec 2013 22:52:50 -0800
changeset 174326 96800b422285f2b20167c56b073b07fda54ab4ba
parent 174325 4d07001e9afc078a8d6b337ac746dce99b3de2a7
child 174327 58dbd2146e24df18ee5d1e9057b531093571de51
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs940194
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 940194 - Build netwerk/cookie in unified mode. r=ehsan
netwerk/cookie/moz.build
--- a/netwerk/cookie/moz.build
+++ b/netwerk/cookie/moz.build
@@ -18,20 +18,23 @@ XPIDL_MODULE = 'necko_cookie'
 
 if CONFIG['NECKO_COOKIES']:
     MSVC_ENABLE_PGO = True
 
     EXPORTS.mozilla.net = [
         'CookieServiceChild.h',
         'CookieServiceParent.h',
     ]
-    SOURCES += [
+    UNIFIED_SOURCES += [
         'CookieServiceChild.cpp',
         'CookieServiceParent.cpp',
         'nsCookie.cpp',
+    ]
+    # nsCookieService.cpp can't be unified because it forces NSPR logging.
+    SOURCES += [
         'nsCookieService.cpp',
     ]
     LOCAL_INCLUDES += [
         '/intl/uconv/src',
     ]
 
     XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']