summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--breakpad/breakpad.gyp10
2 files changed, 11 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 8e3e86c..e3a9bed 100644
--- a/DEPS
+++ b/DEPS
@@ -58,7 +58,7 @@ vars = {
deps = {
"src/breakpad/src":
- (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1139",
+ (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1146",
"src/googleurl":
(Var("googlecode_url") % "google-url") + "/trunk@183",
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp
index e825b38..8a6ba14 100644
--- a/breakpad/breakpad.gyp
+++ b/breakpad/breakpad.gyp
@@ -615,6 +615,16 @@
'..',
'src',
],
+ 'conditions': [
+ ['OS=="android"', {
+ 'libraries': [
+ '-llog',
+ ],
+ 'include_dirs': [
+ 'src/common/android/include',
+ ],
+ }],
+ ],
},
{
'target_name': 'minidump-2-core',