Bug 1035125 Part 2: Back out changeset 3c59642f6445 and associated subsequent changes. r=glandium
authorBob Owen <bobowencode@gmail.com>
Sun, 15 May 2016 16:23:56 +0100
changeset 297621 1978e4289d257d946404deef8a523e32af85ebe5
parent 297620 f6d5f66066748dca0a3e3bb3c3cb58d58884216d
child 297622 74634eed179d64791e1e61b01f7b07f16c498d7c
push id30264
push userkwierso@gmail.com
push dateTue, 17 May 2016 20:52:53 +0000
treeherdermozilla-central@991f249a6ffa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1035125, 1023941
milestone49.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 1035125 Part 2: Back out changeset 3c59642f6445 and associated subsequent changes. r=glandium The original changeset that is being backed out had comment: Bug 1023941 - Part 4: Static-link the CRT into crashreporter.exe. MozReview-Commit-ID: AWoYiy4TfNW
toolkit/crashreporter/breakpad-windows-libxul/moz.build
toolkit/crashreporter/breakpad-windows-libxul/staticruntime/moz.build
toolkit/crashreporter/client/moz.build
--- a/toolkit/crashreporter/breakpad-windows-libxul/moz.build
+++ b/toolkit/crashreporter/breakpad-windows-libxul/moz.build
@@ -1,18 +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/.
 
-DIRS += [
-    'staticruntime'
-]
-
 SOURCES += [
     '../google-breakpad/src/common/windows/http_upload.cc',
 ]
 
 Library('google_breakpad_libxul_s')
 
 FINAL_LIBRARY = 'xul'
 
deleted file mode 100644
--- a/toolkit/crashreporter/breakpad-windows-libxul/staticruntime/moz.build
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- 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('google_breakpad_libxul_staticruntime_s')
-
-for var in ('UNICODE', 'UNICODE_', 'BREAKPAD_NO_TERMINATE_THREAD'):
-    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
--- a/toolkit/crashreporter/client/moz.build
+++ b/toolkit/crashreporter/client/moz.build
@@ -13,25 +13,24 @@ if CONFIG['OS_TARGET'] != 'Android':
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     UNIFIED_SOURCES += [
         'crashreporter_win.cpp',
     ]
     DEFINES['UNICODE'] = True
     DEFINES['_UNICODE'] = True
     USE_LIBS += [
-        'google_breakpad_libxul_staticruntime_s',
+        'google_breakpad_libxul_s',
     ]
     OS_LIBS += [
         'comctl32',
         'shell32',
         'wininet',
         'shlwapi',
     ]
-    USE_STATIC_LIBS = True
 elif CONFIG['OS_ARCH'] == 'Darwin':
     UNIFIED_SOURCES += [
         'crashreporter_osx.mm',
         'crashreporter_unix_common.cpp',
     ]
     LOCAL_INCLUDES += [
         '../google-breakpad/src/common/mac',
     ]