diff options
| author | olivierrobin <olivierrobin@chromium.org> | 2016-01-21 10:50:26 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-21 18:51:19 +0000 |
| commit | 6c6d782163429484047d64a006d9f74395806591 (patch) | |
| tree | c97c1c264a020cfca049c1471d2ed193b2abfd00 | |
| parent | 12a62b08d77fb5cdac1ddd754b1a6a81875e92fd (diff) | |
| download | chromium_src-6c6d782163429484047d64a006d9f74395806591.zip chromium_src-6c6d782163429484047d64a006d9f74395806591.tar.gz chromium_src-6c6d782163429484047d64a006d9f74395806591.tar.bz2 | |
Roll breakpad to e654eb71272829c6f00024f96a10a1882c08a282
This effictively revert CL https://codereview.chromium.org/1567973002
to fix crash reporting on iOS.
BUG=569158
Review URL: https://codereview.chromium.org/1611283002
Cr-Commit-Position: refs/heads/master@{#370738}
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | breakpad/breakpad.gyp | 10 |
2 files changed, 11 insertions, 1 deletions
@@ -106,7 +106,7 @@ allowed_hosts = [ deps = { 'src/breakpad/src': - Var('chromium_git') + '/breakpad/breakpad/src.git' + '@' + 'c051af689cdb08d9cecaa127f3d69eba006d0bc9', + Var('chromium_git') + '/breakpad/breakpad/src.git' + '@' + 'e654eb71272829c6f00024f96a10a1882c08a282', 'src/buildtools': Var('chromium_git') + '/chromium/buildtools.git' + '@' + Var('buildtools_revision'), diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 030fd40..69ce5be 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -306,6 +306,16 @@ 'src/common/simple_string_dictionary.cc', 'src/common/string_conversion.cc', ], + 'conditions': [ + ['OS=="ios"', { + 'xcode_settings' : { + 'WARNING_CFLAGS': [ + # See https://bugs.chromium.org/p/google-breakpad/issues/detail?id=675. + '-Wno-deprecated-declarations', + ], + }, + }], + ], }, { # GN version: //breakpad:crash_inspector |