Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1472789 - make the windows crashreporter not dependent on libxul files; r=ted.mielczarek

Browse Source 
This makes one less place where we link code compiled for libxul into a
place that doesn't link mozglue, and is cleaner to boot.  We don't need
the BREAKPAD_NO_TERMINATE_THREAD define that breakpad-windows-libxul
defines because we're not including the handler code in the
crashreporter binary.
This commit is contained in:
Nathan Froyd 2018-07-03 20:09:37 -04:00
parent 6cc49d76d9
commit 92953ed036
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolkit/crashreporter/breakpad-windows-libxul/moz.build
View File

@ -4,10 +4,6 @@
# 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_s')
FINAL_LIBRARY = 'xul'
@ -22,14 +18,12 @@ LOCAL_INCLUDES += [
include('/toolkit/crashreporter/google-breakpad/src/common/windows/objs.mozbuild')
include('/toolkit/crashreporter/breakpad-client/windows/handler/objs.mozbuild')
include('/toolkit/crashreporter/breakpad-client/windows/sender/objs.mozbuild')
include('/toolkit/crashreporter/breakpad-client/windows/crash_generation/objs.mozbuild')
include('/toolkit/crashreporter/breakpad-client/windows/common/objs.mozbuild')
SOURCES += objs_common
SOURCES += objs_crash_generation
SOURCES += objs_handler
SOURCES += objs_sender
SOURCES += objs_client_common
DisableStlWrapping()

12
toolkit/crashreporter/client/moz.build
View File

@ -24,10 +24,20 @@ if CONFIG['OS_ARCH'] == 'WINNT':
UNIFIED_SOURCES += [
'crashreporter_win.cpp',
]
include('/toolkit/crashreporter/google-breakpad/src/common/windows/objs.mozbuild')
include('/toolkit/crashreporter/breakpad-client/windows/sender/objs.mozbuild')
include('/toolkit/crashreporter/breakpad-client/windows/crash_generation/objs.mozbuild')
include('/toolkit/crashreporter/breakpad-client/windows/common/objs.mozbuild')
SOURCES += objs_common
SOURCES += objs_sender
SOURCES += objs_crash_generation
SOURCES += objs_client_common
SOURCES += [
'../google-breakpad/src/common/windows/http_upload.cc',
]
DEFINES['UNICODE'] = True
DEFINES['_UNICODE'] = True
USE_LIBS += [
'google_breakpad_libxul_s',
'nss',
]
OS_LIBS += [