diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 07:13:46 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 07:13:46 +0000 |
commit | 9021fec612df19ed1f1ab912d3223eb07d8a169f (patch) | |
tree | 756956b7e3a613fc376f2b9f57f02e61ffd58708 | |
parent | d9d04df4dd96e5db9934ed83265b09e5b2cce59e (diff) | |
download | chromium_src-9021fec612df19ed1f1ab912d3223eb07d8a169f.zip chromium_src-9021fec612df19ed1f1ab912d3223eb07d8a169f.tar.gz chromium_src-9021fec612df19ed1f1ab912d3223eb07d8a169f.tar.bz2 |
Roll DEPS for Breakpad 1052:1069 (try 2, add missing mac files to breakpad.gyp)
TBR=mark
Review URL: https://chromiumcodereview.appspot.com/11110005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161524 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | DEPS | 2 | ||||
-rw-r--r-- | breakpad/breakpad.gyp | 29 |
2 files changed, 18 insertions, 13 deletions
@@ -44,7 +44,7 @@ vars = { deps = { "src/breakpad/src": - (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1052", + (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1069", "src/googleurl": (Var("googlecode_url") % "google-url") + "/trunk@179", diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index e79001e..99ebf6c 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -27,21 +27,22 @@ 'target_name': 'breakpad_utilities', 'type': 'static_library', 'sources': [ - 'src/common/convert_UTF.c', 'src/client/mac/handler/breakpad_nlist_64.cc', 'src/client/mac/handler/dynamic_images.cc', + 'src/client/mac/handler/minidump_generator.cc', + 'src/client/minidump_file_writer.cc', + 'src/common/convert_UTF.c', + 'src/common/mac/MachIPC.mm', + 'src/common/mac/SimpleStringDictionary.mm', + 'src/common/mac/arch_utilities.cc', 'src/common/mac/bootstrap_compat.cc', 'src/common/mac/file_id.cc', - 'src/common/mac/MachIPC.mm', 'src/common/mac/macho_id.cc', 'src/common/mac/macho_utilities.cc', 'src/common/mac/macho_walker.cc', - 'src/client/minidump_file_writer.cc', - 'src/client/mac/handler/minidump_generator.cc', - 'src/common/mac/SimpleStringDictionary.mm', - 'src/common/string_conversion.cc', 'src/common/mac/string_utilities.cc', 'src/common/md5.cc', + 'src/common/string_conversion.cc', ], }, { @@ -116,24 +117,26 @@ 'src/common/mac', ], 'sources': [ - 'src/common/dwarf/dwarf2diehandler.cc', - 'src/common/dwarf/dwarf2reader.cc', + 'pending/src/common/dwarf_cu_to_module.cc', + 'pending/src/common/module.cc', 'src/common/dwarf/bytereader.cc', 'src/common/dwarf_cfi_to_module.cc', - 'pending/src/common/dwarf_cu_to_module.cc', + 'src/common/dwarf/dwarf2diehandler.cc', + 'src/common/dwarf/dwarf2reader.cc', 'src/common/dwarf_line_to_module.cc', 'src/common/language.cc', - 'pending/src/common/module.cc', + 'src/common/mac/arch_utilities.cc', + 'src/common/mac/arch_utilities.h', 'src/common/mac/dump_syms.mm', 'src/common/mac/file_id.cc', 'src/common/mac/macho_id.cc', 'src/common/mac/macho_reader.cc', 'src/common/mac/macho_utilities.cc', 'src/common/mac/macho_walker.cc', + 'src/common/md5.cc', 'src/common/stabs_reader.cc', 'src/common/stabs_to_module.cc', 'src/tools/mac/dump_syms/dump_syms_tool.mm', - 'src/common/md5.cc', ], 'defines': [ # For src/common/stabs_reader.h. @@ -254,7 +257,8 @@ '..', ], 'sources': [ - 'src/google_breakpad/procesor/call_stack.h', + 'src/google_breakpad/processor/call_stack.h', + 'src/google_breakpad/processor/stack_frame_symbolizer.h', 'src/processor/minidump_stackwalk.cc', 'src/processor/stackwalker.cc', 'src/processor/stackwalker.h', @@ -288,6 +292,7 @@ 'src/processor/simple_symbol_supplier.h', 'src/processor/source_line_resolver_base.cc', 'src/processor/source_line_resolver_base.h', + 'src/processor/stack_frame_symbolizer.cc', 'src/processor/stackwalker.cc', 'src/processor/stackwalker.h', 'src/processor/stackwalker_amd64.cc', |