diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 03:34:28 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 03:34:28 +0000 |
| commit | 1353a09a96e0427f01913a94149b7bc91beb2284 (patch) | |
| tree | 384fdbe7cd3ff4de70a371db2ff003eb0f3fe497 | |
| parent | b8cc821131b9feb292305b007e4ebce4ce04f9b7 (diff) | |
| download | chromium_src-1353a09a96e0427f01913a94149b7bc91beb2284.zip chromium_src-1353a09a96e0427f01913a94149b7bc91beb2284.tar.gz chromium_src-1353a09a96e0427f01913a94149b7bc91beb2284.tar.bz2 | |
Roll DEPS for Breakpad r897:r902. Mostly changes being upstreamed from CrOS's branch. Cleanup some whitespaces while we're at it.
Review URL: http://codereview.chromium.org/9158035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117602 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | breakpad/breakpad.gyp | 24 | ||||
| -rw-r--r-- | build/common.gypi | 4 |
3 files changed, 27 insertions, 3 deletions
@@ -47,7 +47,7 @@ vars = { deps = { "src/breakpad/src": - (Var("googlecode_url") % "google-breakpad") + "/trunk/src@897", + (Var("googlecode_url") % "google-breakpad") + "/trunk/src@902", "src/build/util/support": "/trunk/deps/support@20411", diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 695932f..112f872 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -399,6 +399,7 @@ '../testing/gmock.gyp:gmock', 'breakpad_client', 'breakpad_processor_support', + 'linux_dumper_unittest_helper', ], 'sources': [ @@ -408,11 +409,21 @@ 'src/client/linux/minidump_writer/line_reader_unittest.cc', 'src/client/linux/minidump_writer/linux_dumper_unittest.cc', 'src/client/linux/minidump_writer/minidump_writer_unittest.cc', + 'src/common/linux/elf_core_dump.cc', + 'src/common/linux/elf_core_dump.h', + 'src/common/linux/elf_core_dump_unittest.cc', '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/crash_generator.cc', + 'src/common/linux/tests/crash_generator.h', + 'src/common/memory_range.h', 'src/common/memory_unittest.cc', 'src/common/test_assembler.cc', + 'src/common/tests/file_utils.cc', + 'src/common/tests/file_utils.h', + 'src/tools/linux/md2core/minidump_memory_range.h', + 'src/tools/linux/md2core/minidump_memory_range_unittest.cc', ], 'include_dirs': [ @@ -423,6 +434,19 @@ ], }, { + 'target_name': 'linux_dumper_unittest_helper', + 'type': 'executable', + 'dependencies': [ + ], + 'sources': [ + 'src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc', + ], + + 'include_dirs': [ + '..', + ], + }, + { 'target_name': 'generate_test_dump', 'type': 'executable', diff --git a/build/common.gypi b/build/common.gypi index 9c1d9db..6684e20 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -32,7 +32,7 @@ # Whether or not we are using the Aura windowing framework. 'use_aura%': 0, - + # Whether or not we are building the Ash shell. 'use_ash%': 0, @@ -72,7 +72,7 @@ 'host_arch%': '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")', }], - + # Ash requires Aura. ['use_ash==1', { 'use_aura%': 1, |