diff options
| author | qsr@chromium.org <qsr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-06 07:48:05 +0000 |
|---|---|---|
| committer | qsr@chromium.org <qsr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-06 07:48:05 +0000 |
| commit | 271e88fc4bdd45ea3b41619b4cd6afa1ff06a4b4 (patch) | |
| tree | ebc9661d5925915063f4523e5dde603478321eb1 | |
| parent | 800569daa182061f6ad9ca811168b181d2ad8ef8 (diff) | |
| download | chromium_src-271e88fc4bdd45ea3b41619b4cd6afa1ff06a4b4.zip chromium_src-271e88fc4bdd45ea3b41619b4cd6afa1ff06a4b4.tar.gz chromium_src-271e88fc4bdd45ea3b41619b4cd6afa1ff06a4b4.tar.bz2 | |
Roll breakpad DEPS r1155 - r1169.
Based on https://codereview.chromium.org/13864007/
BUG=77656
Review URL: https://codereview.chromium.org/14744007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198401 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | breakpad/breakpad.gyp | 5 | ||||
| -rw-r--r-- | chrome/chrome_common.gypi | 4 | ||||
| -rw-r--r-- | chrome/chrome_tests_unit.gypi | 5 | ||||
| -rw-r--r-- | chrome/common/crash_keys.cc | 2 |
5 files changed, 16 insertions, 2 deletions
@@ -58,7 +58,7 @@ vars = { deps = { "src/breakpad/src": - (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1155", + (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1169", "src/googleurl": (Var("googlecode_url") % "google-url") + "/trunk@183", diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 80fd677..981fc93 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -426,6 +426,7 @@ 'src/client/linux/handler/minidump_descriptor.h', 'src/client/linux/log/log.cc', 'src/client/linux/log/log.h', + 'src/client/linux/minidump_writer/cpu_set.h', 'src/client/linux/minidump_writer/directory_reader.h', 'src/client/linux/minidump_writer/line_reader.h', 'src/client/linux/minidump_writer/linux_core_dumper.cc', @@ -436,6 +437,7 @@ 'src/client/linux/minidump_writer/linux_ptrace_dumper.h', 'src/client/linux/minidump_writer/minidump_writer.cc', 'src/client/linux/minidump_writer/minidump_writer.h', + 'src/client/linux/minidump_writer/proc_cpuinfo_reader.h', 'src/client/minidump_file_writer-inl.h', 'src/client/minidump_file_writer.cc', 'src/client/minidump_file_writer.h', @@ -544,12 +546,14 @@ 'sources': [ 'linux/breakpad_googletest_includes.h', 'src/client/linux/handler/exception_handler_unittest.cc', + 'src/client/linux/minidump_writer/cpu_set_unittest.cc', 'src/client/linux/minidump_writer/directory_reader_unittest.cc', 'src/client/linux/minidump_writer/line_reader_unittest.cc', 'src/client/linux/minidump_writer/linux_core_dumper_unittest.cc', 'src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc', 'src/client/linux/minidump_writer/minidump_writer_unittest.cc', 'src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc', + 'src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc', 'src/common/linux/elf_core_dump_unittest.cc', 'src/common/linux/file_id_unittest.cc', 'src/common/linux/linux_libc_support_unittest.cc', @@ -560,6 +564,7 @@ 'src/common/memory_unittest.cc', 'src/common/simple_string_dictionary_unittest.cc', 'src/common/test_assembler.cc', + 'src/common/tests/audio_testfile.h', 'src/common/tests/file_utils.cc', 'src/common/tests/file_utils.h', 'src/tools/linux/md2core/minidump_memory_range.h', diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 03ee500..1b50b43 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -492,6 +492,9 @@ ['include', '^common/chrome_version_info\\.cc$'], ['include', '^common/zip'], ], + 'include_dirs': [ + '<(DEPTH)/breakpad/src', + ], }], ['OS=="android"', { 'sources/': [ @@ -542,6 +545,7 @@ '../third_party/mach_override/mach_override.gyp:mach_override', ], 'include_dirs': [ + '<(DEPTH)/breakpad/src', '../third_party/GTM', ], 'sources!': [ diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index c606bb8..0978e4b 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -2426,6 +2426,11 @@ 'common/crash_keys.h', ], 'conditions': [ + ['OS=="mac" or OS=="ios"', { + 'include_dirs': [ + '<(DEPTH)/breakpad/src', + ], + }], ['OS=="mac"', { # TODO(mark): We really want this for all non-static library targets, # but when we tried to pull it up to the common.gypi level, it broke diff --git a/chrome/common/crash_keys.cc b/chrome/common/crash_keys.cc index ae92496..691e87754 100644 --- a/chrome/common/crash_keys.cc +++ b/chrome/common/crash_keys.cc @@ -27,7 +27,7 @@ const size_t kLargeSize = kSmallSize * 16; // the actual length of the string is one less. #if defined(OS_MACOSX) static const size_t kSingleChunkLength = - google_breakpad::KeyValueEntry::MAX_STRING_STORAGE_SIZE - 1; + google_breakpad::SimpleStringDictionary::value_size - 1; #elif defined(OS_WIN) static const size_t kSingleChunkLength = google_breakpad::CustomInfoEntry::kValueMaxLength - 1; |