Bug 1023941 - Part 4: Static-link the CRT into crashreporter.exe. r=ted

--HG--
rename : toolkit/crashreporter/breakpad-windows-libxul/moz.build => toolkit/crashreporter/breakpad-windows-libxul/staticruntime/moz.build
extra : rebase_source : e6c6e848b1d98e3459fd71997737ea7672cac415

toolkit/crashreporter/breakpad-windows-libxul/moz.build

@@ -4,6 +4,10 @@
 # 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/.
 
+DIRS += [
+    'staticruntime'
+]
+
 SOURCES += [
     '../google-breakpad/src/common/windows/http_upload.cc',
 ]

toolkit/crashreporter/breakpad-windows-libxul/staticruntime/moz.build

@@ -0,0 +1,31 @@
+# -*- 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/.
+
+SOURCES += [
+    '../../google-breakpad/src/common/windows/http_upload.cc',
+]
+
+LIBRARY_NAME = 'google_breakpad_libxul_staticruntime_s'
+
+for var in ('UNICODE', 'UNICODE_', 'BREAKPAD_NO_TERMINATE_THREAD', 'NOMINMAX'):
+    DEFINES[var] = True
+
+LOCAL_INCLUDES += [
+    '/toolkit/crashreporter/google-breakpad/src',
+]
+
+include('/toolkit/crashreporter/google-breakpad/src/common/windows/objs.mozbuild')
+include('/toolkit/crashreporter/google-breakpad/src/client/windows/handler/objs.mozbuild')
+include('/toolkit/crashreporter/google-breakpad/src/client/windows/sender/objs.mozbuild')
+include('/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mozbuild')
+
+SOURCES += objs_common
+SOURCES += objs_crash_generation
+SOURCES += objs_handler
+SOURCES += objs_sender
+
+DISABLE_STL_WRAPPING = True
+USE_STATIC_LIBS = True

toolkit/crashreporter/client/moz.build

@@ -22,7 +22,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     DEFINES['UNICODE'] = True
     DEFINES['_UNICODE'] = True
     USE_LIBS += [
-        'google_breakpad_libxul_s',
+        'google_breakpad_libxul_staticruntime_s',
     ]
     OS_LIBS += [
         'comctl32',
@@ -30,6 +30,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         'wininet',
         'shlwapi',
     ]
+    USE_STATIC_LIBS = True
 elif CONFIG['OS_ARCH'] == 'Darwin':
     UNIFIED_SOURCES += [
         'crashreporter_osx.mm',