diff options
Diffstat (limited to 'breakpad')
| -rw-r--r-- | breakpad/BUILD.gn | 43 | ||||
| -rw-r--r-- | breakpad/breakpad.gyp | 47 |
2 files changed, 73 insertions, 17 deletions
diff --git a/breakpad/BUILD.gn b/breakpad/BUILD.gn index 884caf1..bae85d6 100644 --- a/breakpad/BUILD.gn +++ b/breakpad/BUILD.gn @@ -37,10 +37,11 @@ config("handler_config") { ] } -# minidump_stackwalk and minidump_dump are tool-type executables that do +# {micro,mini}dump_stackwalk and minidump_dump are tool-type executables that do # not build on iOS. if (current_toolchain == host_toolchain && !is_win) { - executable("minidump_stackwalk") { + # Contains the code shared by both {micro,mini}dump_stackwalk. + static_library("stackwalk_common") { sources = [ "src/processor/basic_code_module.h", "src/processor/basic_code_modules.cc", @@ -55,12 +56,8 @@ if (current_toolchain == host_toolchain && !is_win) { "src/processor/disassembler_x86.h", "src/processor/dump_context.cc", "src/processor/dump_object.cc", - "src/processor/exploitability.cc", "src/processor/logging.cc", "src/processor/logging.h", - "src/processor/minidump.cc", - "src/processor/minidump_processor.cc", - "src/processor/minidump_stackwalk.cc", "src/processor/pathname_stripper.cc", "src/processor/pathname_stripper.h", "src/processor/process_state.cc", @@ -69,6 +66,7 @@ if (current_toolchain == host_toolchain && !is_win) { "src/processor/source_line_resolver_base.cc", "src/processor/stack_frame_cpu.cc", "src/processor/stack_frame_symbolizer.cc", + "src/processor/stackwalk_common.cc", "src/processor/stackwalker.cc", "src/processor/stackwalker_amd64.cc", "src/processor/stackwalker_amd64.h", @@ -122,6 +120,39 @@ if (current_toolchain == host_toolchain && !is_win) { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] configs += [ ":tools_config" ] + } + + executable("microdump_stackwalk") { + sources = [ + "src/processor/microdump.cc", + "src/processor/microdump_processor.cc", + "src/processor/microdump_stackwalk.cc", + ] + + deps = [ ":stackwalk_common" ] + + defines = [ "BPLOG_MINIMUM_SEVERITY=SEVERITY_ERROR" ] + + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ ":tools_config" ] + } + + executable("minidump_stackwalk") { + sources = [ + "src/processor/exploitability.cc", + "src/processor/minidump.cc", + "src/processor/minidump_processor.cc", + "src/processor/minidump_stackwalk.cc", + ] + + deps = [ ":stackwalk_common" ] + + defines = [ "BPLOG_MINIMUM_SEVERITY=SEVERITY_ERROR" ] + + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + configs += [ ":tools_config" ] # Always want these files included regardless of platform. set_sources_assignment_filter([]) diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 39f25c4..038290f 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -13,9 +13,10 @@ ['OS!="ios" and OS!="win"', { 'targets': [ { - # GN version: //breakpad:minidump_stackwalk - 'target_name': 'minidump_stackwalk', - 'type': 'executable', + # code shared by both {micro,mini}dump_stackwalk + # GN version: //breakpad:stackwalk_common + 'target_name': 'stackwalk_common', + 'type': 'static_library', 'includes': ['breakpad_tools.gypi'], 'defines': ['BPLOG_MINIMUM_SEVERITY=SEVERITY_ERROR'], 'sources': [ @@ -32,16 +33,8 @@ 'src/processor/disassembler_x86.h', 'src/processor/dump_context.cc', 'src/processor/dump_object.cc', - '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', 'src/processor/logging.h', - 'src/processor/minidump.cc', - 'src/processor/minidump_processor.cc', - 'src/processor/minidump_stackwalk.cc', 'src/processor/pathname_stripper.cc', 'src/processor/pathname_stripper.h', 'src/processor/process_state.cc', @@ -50,6 +43,7 @@ 'src/processor/source_line_resolver_base.cc', 'src/processor/stack_frame_cpu.cc', 'src/processor/stack_frame_symbolizer.cc', + 'src/processor/stackwalk_common.cc', 'src/processor/stackwalker.cc', 'src/processor/stackwalker_amd64.cc', 'src/processor/stackwalker_amd64.h', @@ -99,6 +93,37 @@ ], }, { + # GN version: //breakpad:microdump_stackwalk + 'target_name': 'microdump_stackwalk', + 'type': 'executable', + 'dependencies': ['stackwalk_common'], + 'includes': ['breakpad_tools.gypi'], + 'defines': ['BPLOG_MINIMUM_SEVERITY=SEVERITY_ERROR'], + 'sources': [ + 'src/processor/microdump.cc', + 'src/processor/microdump_processor.cc', + 'src/processor/microdump_stackwalk.cc', + ], + }, + { + # GN version: //breakpad:minidump_stackwalk + 'target_name': 'minidump_stackwalk', + 'type': 'executable', + 'dependencies': ['stackwalk_common'], + 'includes': ['breakpad_tools.gypi'], + 'defines': ['BPLOG_MINIMUM_SEVERITY=SEVERITY_ERROR'], + 'sources': [ + '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/minidump.cc', + 'src/processor/minidump_processor.cc', + 'src/processor/minidump_stackwalk.cc', + ], + }, + { # GN version: //breakpad:minidump_dump 'target_name': 'minidump_dump', 'type': 'executable', |