Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-13 19:41:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1558372 - Fixed Crash Reporter on Mac. r=snorp,froydnj,geckoview-reviewers

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D35877

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Alvina Waseem 2019-06-27 19:51:04 +00:00
parent 1e64f27aad
commit 627ccdaaa3
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
old-configure.in
View File

@ -2082,7 +2082,7 @@ MOZ_ARG_DISABLE_BOOL(crashreporter,
[MOZ_CRASHREPORTER=],
[MOZ_CRASHREPORTER=F # Force enable breakpad])
if test "$OS_ARCH" != "$HOST_OS_ARCH" -a "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "Darwin"; then
if test "$OS_ARCH" != "$HOST_OS_ARCH" -a "$OS_ARCH" != "WINNT" -a "$OS_ARCH" != "Darwin" -a "$MOZ_WIDGET_TOOLKIT" != "android"; then
if test "$MOZ_CRASHREPORTER" = F; then
AC_MSG_ERROR([Cannot --enable-crashreporter, as breakpad tools do not support compiling on $HOST_OS_ARCH while targeting $OS_ARCH.])
fi

30
toolkit/crashreporter/google-breakpad/src/common/linux/moz.build
View File

@ -21,21 +21,23 @@ if CONFIG['OS_TARGET'] != 'Android':
'http_upload.cc',
]
HostLibrary('host_breakpad_linux_common_s')
HOST_SOURCES += [
'crc32.cc',
'dump_symbols.cc',
'elf_symbols_to_module.cc',
'elfutils.cc',
'file_id.cc',
'linux_libc_support.cc',
'memory_mapped_file.cc',
]
if CONFIG['HOST_OS_ARCH'] == 'Linux':
HostLibrary('host_breakpad_linux_common_s')
HOST_CXXFLAGS += [
'-O2',
'-g',
]
HOST_SOURCES += [
'crc32.cc',
'dump_symbols.cc',
'elf_symbols_to_module.cc',
'elfutils.cc',
'file_id.cc',
'linux_libc_support.cc',
'memory_mapped_file.cc',
]
HOST_CXXFLAGS += [
'-O2',
'-g',
]
if CONFIG['OS_TARGET'] == 'Android':
DEFINES['ANDROID_NDK_MAJOR_VERSION'] = CONFIG['ANDROID_NDK_MAJOR_VERSION']

3
toolkit/crashreporter/google-breakpad/src/common/moz.build
View File

@ -64,9 +64,6 @@ if CONFIG['OS_TARGET'] == 'Android':
SOURCES += [
'android/breakpad_getcontext.S',
]
LOCAL_INCLUDES += [
'/toolkit/crashreporter/google-breakpad/src/common/android/include',
]
Library('breakpad_common_s')

3
toolkit/crashreporter/moz.build
View File

@ -60,9 +60,10 @@ if CONFIG['MOZ_CRASHREPORTER']:
'google-breakpad/src/common',
'google-breakpad/src/common/linux',
'google-breakpad/src/processor',
'google-breakpad/src/tools/linux/dump_syms',
'rust',
]
if CONFIG['HOST_OS_ARCH'] != 'Darwin':
DIRS += ['google-breakpad/src/tools/linux/dump_syms']
DIRS += [