diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-11 21:33:03 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2013-12-13 12:34:07 +0100 |
| commit | f2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch) | |
| tree | 0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/breakpad | |
| parent | 5362912cdb5eea702b68ebe23702468d17c3017a (diff) | |
| download | qtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz | |
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/breakpad')
| -rw-r--r-- | chromium/breakpad/breakpad.gyp | 2 | ||||
| -rw-r--r-- | chromium/breakpad/breakpad_tools.gypi | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/chromium/breakpad/breakpad.gyp b/chromium/breakpad/breakpad.gyp index 40151c12dba..482fcd1861a 100644 --- a/chromium/breakpad/breakpad.gyp +++ b/chromium/breakpad/breakpad.gyp @@ -48,6 +48,8 @@ 'src/processor/stackwalker_amd64.h', 'src/processor/stackwalker_arm.cc', 'src/processor/stackwalker_arm.h', + 'src/processor/stackwalker_mips.cc', + 'src/processor/stackwalker_mips.h', 'src/processor/stackwalker_ppc.cc', 'src/processor/stackwalker_ppc.h', 'src/processor/stackwalker_ppc64.cc', diff --git a/chromium/breakpad/breakpad_tools.gypi b/chromium/breakpad/breakpad_tools.gypi index bf38f1a180d..4d7736060d8 100644 --- a/chromium/breakpad/breakpad_tools.gypi +++ b/chromium/breakpad/breakpad_tools.gypi @@ -14,6 +14,11 @@ 'ldflags!': ['-m32'], 'cflags': ['-O2'], 'include_dirs!': ['/usr/include32'], + 'conditions': [ + ['target_arch=="ia32" and sysroot!=""', { + 'cflags!': ['--sysroot=<(sysroot)'], + }], + ], }], ], }], |