diff options
| -rw-r--r-- | breakpad/breakpad.gyp | 4 | ||||
| -rw-r--r-- | build/common.gypi | 5 | ||||
| -rw-r--r-- | chrome/tools/build/linux/SYMBOLS | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index c419e46..d966781 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -186,7 +186,7 @@ [ 'OS=="linux"', { 'conditions': [ # Tools needed for archiving build symbols. - ['branding=="Chrome" or linux_breakpad==1', { + ['linux_breakpad==1', { 'targets': [ { 'target_name': 'symupload', @@ -257,7 +257,7 @@ ], # Breakpad rev 583 introduced this flag. - # Using this define, stabs_reader.h will include a.out.h to + # Using this define, stabs_reader.h will include a.out.h to # build on Linux. 'defines': [ 'HAVE_A_OUT_H', diff --git a/build/common.gypi b/build/common.gypi index faeefc6..0d300a4 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -304,10 +304,7 @@ }], # All Chrome builds have breakpad symbols, but only process the # symbols from official builds. - # TODO(mmoss) dump_syms segfaults on x64. Enable once dump_syms and - # crash server handle 64-bit symbols. - ['(branding=="Chrome" and buildtype=="Official" and ' - 'target_arch=="ia32")', { + ['(branding=="Chrome" and buildtype=="Official")', { 'linux_dump_symbols%': 1, }], ['toolkit_views==0', { diff --git a/chrome/tools/build/linux/SYMBOLS b/chrome/tools/build/linux/SYMBOLS index 873053d..0cb9dd5 100644 --- a/chrome/tools/build/linux/SYMBOLS +++ b/chrome/tools/build/linux/SYMBOLS @@ -1 +1,2 @@ -chrome.breakpad.ia32
\ No newline at end of file +chrome.breakpad.ia32 +chrome.breakpad.x64 |