summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhurunz@google.com <zhurunz@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-28 23:22:22 +0000
committerzhurunz@google.com <zhurunz@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-28 23:22:22 +0000
commit24a0c6ebb8073baaa8dd3a17f409d33dd200ff24 (patch)
tree0663e31e1e7851a81b04f5b449258345ff53388f
parent3648f61d314d9ad09cb22bf9405b8dc7b2e77bfb (diff)
downloadchromium_src-24a0c6ebb8073baaa8dd3a17f409d33dd200ff24.zip
chromium_src-24a0c6ebb8073baaa8dd3a17f409d33dd200ff24.tar.gz
chromium_src-24a0c6ebb8073baaa8dd3a17f409d33dd200ff24.tar.bz2
Sync to latest breakpad which don't have deps on libglog. Be able to build with "shared_library".
Review URL: http://codereview.chromium.org/2388001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48539 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--breakpad/breakpad.gyp6
2 files changed, 7 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index add18fe..37bed0e 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ vars = {
deps = {
"src/breakpad/src":
- "http://google-breakpad.googlecode.com/svn/trunk/src@568",
+ "http://google-breakpad.googlecode.com/svn/trunk/src@604",
"src/build/util/support":
"/trunk/deps/support@20411",
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp
index df10b97..42f72b4 100644
--- a/breakpad/breakpad.gyp
+++ b/breakpad/breakpad.gyp
@@ -279,6 +279,12 @@
'src/common/string_conversion.h',
],
+ 'link_settings': {
+ 'libraries': [
+ '-ldl',
+ ],
+ },
+
'include_dirs': [
'src',
'src/client',