summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsiggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-27 18:22:29 +0000
committersiggi@chromium.org <siggi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-27 18:22:29 +0000
commit6c8855021577431ac68e2680b9ee4cb2c6f5e230 (patch)
tree95f116143984eca3c43ac3c233b459f1f6811e37
parent8da4a2de8addafaff6fcaf86b2d4d9a26ee48962 (diff)
downloadchromium_src-6c8855021577431ac68e2680b9ee4cb2c6f5e230.zip
chromium_src-6c8855021577431ac68e2680b9ee4cb2c6f5e230.tar.gz
chromium_src-6c8855021577431ac68e2680b9ee4cb2c6f5e230.tar.bz2
Revert 48397 - Upgrade the breakpad deps to r600. Includes a #define in the GYP files that's needed by r583, but not defined in Chrome. Since Chrome uses its own GYP files for breakpad, we have to duplicate the definition.
Submitting on behalf of hansl@google.com, original change at http://codereview.chromium.org/2290001/show. BUG=None TEST=None TBR=siggi@chromium.org Review URL: http://codereview.chromium.org/2257006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48407 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--breakpad/breakpad.gyp6
2 files changed, 1 insertions, 7 deletions
diff --git a/DEPS b/DEPS
index d5febb3..ea436ab 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ vars = {
deps = {
"src/breakpad/src":
- "http://google-breakpad.googlecode.com/svn/trunk/src@600",
+ "http://google-breakpad.googlecode.com/svn/trunk/src@568",
"src/build/util/support":
"/trunk/deps/support@20411",
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp
index aa9e74e..df10b97 100644
--- a/breakpad/breakpad.gyp
+++ b/breakpad/breakpad.gyp
@@ -236,12 +236,6 @@
'src/tools/linux/dump_syms/dump_syms.cc',
],
- # Using this define, stabs_reader.h will include the right headers
- # to work correctly on Linux.
- 'defines': [
- 'HAVE_A_OUT_H',
- ],
-
'include_dirs': [
'src',
'..',