diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-02 01:55:06 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-02 01:55:06 +0000 |
| commit | b07fc5114ccce26011ec2312eee3397134739f9a (patch) | |
| tree | 1570e3652386e2b314e1be8067e7e44a00f49b75 /breakpad/breakpad.gyp | |
| parent | 74f34b094a7b21f0c057f493abee5db30b988592 (diff) | |
| download | chromium_src-b07fc5114ccce26011ec2312eee3397134739f9a.zip chromium_src-b07fc5114ccce26011ec2312eee3397134739f9a.tar.gz chromium_src-b07fc5114ccce26011ec2312eee3397134739f9a.tar.bz2 | |
Linux: Use upstream google-breakpad instead of our fork.
BUG=28276
TEST=dump_syms works with ToT Chrome.
Review URL: http://codereview.chromium.org/414049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'breakpad/breakpad.gyp')
| -rw-r--r-- | breakpad/breakpad.gyp | 57 |
1 files changed, 38 insertions, 19 deletions
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 1fed709..74ed1f1 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -247,6 +247,7 @@ 'sources': [ 'src/tools/linux/symupload/sym_upload.cc', 'src/common/linux/http_upload.cc', + 'src/common/linux/http_upload.h', ], 'include_dirs': [ 'src', @@ -262,11 +263,16 @@ 'type': 'executable', 'sources': [ - 'linux/dump_syms.cc', - 'linux/dump_symbols.cc', - 'linux/dump_symbols.h', - 'linux/file_id.cc', - 'linux/file_id.h', + 'src/common/linux/dump_symbols.cc', + 'src/common/linux/dump_symbols.h', + 'src/common/linux/file_id.cc', + 'src/common/linux/file_id.h', + 'src/common/linux/guid_creator.h', + 'src/common/linux/module.cc', + 'src/common/linux/module.h', + 'src/common/linux/stabs_reader.cc', + 'src/common/linux/stabs_reader.h', + 'src/tools/linux/dump_syms/dump_syms.cc', ], 'include_dirs': [ @@ -283,15 +289,25 @@ 'type': '<(library)', 'sources': [ - 'linux/exception_handler.cc', - 'linux/linux_dumper.cc', - 'linux/minidump_writer.cc', + 'src/client/linux/handler/exception_handler.cc', + 'src/client/linux/minidump_writer/directory_reader.h', + 'src/client/linux/minidump_writer/line_reader.h', + 'src/client/linux/minidump_writer/linux_dumper.cc', + 'src/client/linux/minidump_writer/linux_dumper.h', + 'src/client/linux/minidump_writer/minidump_writer.cc', + 'src/client/linux/minidump_writer/minidump_writer.h', + 'src/client/minidump_file_writer-inl.h', + 'src/client/minidump_file_writer.cc', + 'src/client/minidump_file_writer.h', + 'src/common/convert_UTF.c', + 'src/common/convert_UTF.h', 'src/common/linux/guid_creator.cc', + 'src/common/linux/guid_creator.h', + 'src/common/linux/linux_libc_support.h', + 'src/common/linux/linux_syscall_support.h', + 'src/common/linux/memory.h', 'src/common/string_conversion.cc', - 'src/common/convert_UTF.c', - - # TODO(agl): unfork this file - 'linux/minidump_file_writer.cc', + 'src/common/string_conversion.h', ], 'include_dirs': [ @@ -306,20 +322,23 @@ 'dependencies': [ '../testing/gtest.gyp:gtest', '../testing/gtest.gyp:gtestmain', + '../testing/gmock.gyp:gmock', 'breakpad_client', ], 'sources': [ - 'linux/directory_reader_unittest.cc', - 'linux/exception_handler_unittest.cc', - 'linux/line_reader_unittest.cc', - 'linux/linux_dumper_unittest.cc', - 'linux/linux_libc_support_unittest.cc', - 'linux/memory_unittest.cc', - 'linux/minidump_writer_unittest.cc', + 'src/client/linux/minidump_writer/directory_reader_unittest.cc', + 'src/client/linux/handler/exception_handler_unittest.cc', + 'src/client/linux/minidump_writer/line_reader_unittest.cc', + 'src/client/linux/minidump_writer/linux_dumper_unittest.cc', + 'src/common/linux/linux_libc_support_unittest.cc', + 'src/common/linux/memory_unittest.cc', + 'src/client/linux/minidump_writer/minidump_writer_unittest.cc', + 'linux/breakpad_googletest_includes.h', ], 'include_dirs': [ + 'linux', # Use our copy of breakpad_googletest_includes.h 'src', '..', '.', |