From d647b1e662319c1915befe8818934f456de3457f Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Sun, 26 Sep 2010 02:39:05 +0000 Subject: Roll DEPS for Breakpad r697:r700. BUG=none TEST=official builds work properly. Review URL: http://codereview.chromium.org/3417024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60593 0039d316-1c4b-4281-b951-d872f2087c98 --- DEPS | 2 +- breakpad/breakpad.gyp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index 05df54b..89d736c 100644 --- a/DEPS +++ b/DEPS @@ -14,7 +14,7 @@ vars = { deps = { "src/breakpad/src": - (Var("googlecode_url") % "google-breakpad") + "/trunk/src@697", + (Var("googlecode_url") % "google-breakpad") + "/trunk/src@700", "src/build/util/support": "/trunk/deps/support@20411", diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 35389e3..2b058ec 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -301,7 +301,7 @@ 'src/common/linux/libcurl_wrapper.h', 'src/common/linux/linux_libc_support.h', 'src/common/linux/linux_syscall_support.h', - 'src/common/linux/memory.h', + 'src/common/memory.h', 'src/common/string_conversion.cc', 'src/common/string_conversion.h', ], @@ -364,7 +364,7 @@ 'src/client/linux/minidump_writer/minidump_writer_unittest.cc', 'src/common/linux/file_id_unittest.cc', 'src/common/linux/linux_libc_support_unittest.cc', - 'src/common/linux/memory_unittest.cc', + 'src/common/memory_unittest.cc', ], 'include_dirs': [ -- cgit v1.1