diff options
Diffstat (limited to 'chromium/breakpad/breakpad.gyp')
| -rw-r--r-- | chromium/breakpad/breakpad.gyp | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/chromium/breakpad/breakpad.gyp b/chromium/breakpad/breakpad.gyp index 482fcd1861a..066bf28d3e2 100644 --- a/chromium/breakpad/breakpad.gyp +++ b/chromium/breakpad/breakpad.gyp @@ -16,6 +16,7 @@ 'target_name': 'minidump_stackwalk', 'type': 'executable', 'includes': ['breakpad_tools.gypi'], + 'defines': ['BPLOG_MINIMUM_SEVERITY=SEVERITY_ERROR'], 'sources': [ 'src/processor/basic_code_module.h', 'src/processor/basic_code_modules.cc', @@ -29,6 +30,8 @@ 'src/processor/disassembler_x86.cc', 'src/processor/disassembler_x86.h', 'src/processor/exploitability.cc', + 'src/processor/exploitability_linux.cc', + 'src/processor/exploitability_linux.h', 'src/processor/exploitability_win.cc', 'src/processor/exploitability_win.h', 'src/processor/logging.cc', @@ -42,12 +45,15 @@ 'src/processor/simple_symbol_supplier.cc', 'src/processor/simple_symbol_supplier.h', 'src/processor/source_line_resolver_base.cc', + 'src/processor/stack_frame_cpu.cc', 'src/processor/stack_frame_symbolizer.cc', 'src/processor/stackwalker.cc', 'src/processor/stackwalker_amd64.cc', 'src/processor/stackwalker_amd64.h', 'src/processor/stackwalker_arm.cc', 'src/processor/stackwalker_arm.h', + 'src/processor/stackwalker_arm64.cc', + 'src/processor/stackwalker_arm64.h', 'src/processor/stackwalker_mips.cc', 'src/processor/stackwalker_mips.h', 'src/processor/stackwalker_ppc.cc', @@ -504,14 +510,18 @@ 'src/common/android/breakpad_getcontext.S', ], }], + ['OS!="android"', { + 'link_settings': { + 'libraries': [ + # In case of Android, '-ldl' is added in common.gypi, since it + # is needed for stlport_static. For LD, the order of libraries + # is important, and thus we skip to add it here. + '-ldl', + ], + }, + }], ], - 'link_settings': { - 'libraries': [ - '-ldl', - ], - }, - 'include_dirs': [ 'src', 'src/client', @@ -571,13 +581,13 @@ 'src/common/linux/file_id_unittest.cc', 'src/common/linux/linux_libc_support_unittest.cc', 'src/common/linux/synth_elf.cc', + 'src/common/linux/tests/auto_testfile.h', 'src/common/linux/tests/crash_generator.cc', 'src/common/linux/tests/crash_generator.h', 'src/common/memory_range.h', 'src/common/memory_unittest.cc', 'src/common/simple_string_dictionary_unittest.cc', 'src/common/test_assembler.cc', - 'src/common/tests/auto_testfile.h', 'src/common/tests/file_utils.cc', 'src/common/tests/file_utils.h', 'src/tools/linux/md2core/minidump_memory_range.h', @@ -621,6 +631,13 @@ 'src', '..', ], + 'conditions': [ + ['target_arch=="mipsel" and OS=="android"', { + 'include_dirs': [ + 'src/common/android/include', + ], + }], + ], }, { 'target_name': 'generate_test_dump', |