summaryrefslogtreecommitdiffstats
path: root/breakpad
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-26 02:39:05 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-26 02:39:05 +0000
commitd647b1e662319c1915befe8818934f456de3457f (patch)
tree5366b908bfe90c9cf802eec44a3fe9696155a506 /breakpad
parent073040b43c8d3c01c7019ee7ef3e8664f137f5b6 (diff)
downloadchromium_src-d647b1e662319c1915befe8818934f456de3457f.zip
chromium_src-d647b1e662319c1915befe8818934f456de3457f.tar.gz
chromium_src-d647b1e662319c1915befe8818934f456de3457f.tar.bz2
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
Diffstat (limited to 'breakpad')
-rw-r--r--breakpad/breakpad.gyp4
1 files changed, 2 insertions, 2 deletions
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': [