diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/breakpad/src | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/breakpad/src')
| -rw-r--r-- | chromium/breakpad/src/client/windows/build/common.gypi | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chromium/breakpad/src/client/windows/build/common.gypi b/chromium/breakpad/src/client/windows/build/common.gypi index 60a24582d9f..eac64d25dbc 100644 --- a/chromium/breakpad/src/client/windows/build/common.gypi +++ b/chromium/breakpad/src/client/windows/build/common.gypi @@ -123,10 +123,10 @@ # Python version. 'python_ver%': '2.5', - # Set ARM-v7 compilation flags - 'armv7%': 0, + # Determine ARM compilation flags. + 'arm_version%': 7, - # Set Neon compilation flags (only meaningful if armv7==1). + # Set Neon compilation flags (only meaningful if arm_version==7). 'arm_neon%': 1, # The system root for cross-compiles. Default: none. @@ -148,7 +148,7 @@ 'fastbuild%': '<(fastbuild)', 'linux_fpic%': '<(linux_fpic)', 'python_ver%': '<(python_ver)', - 'armv7%': '<(armv7)', + 'arm_version%': '<(arm_version)', 'arm_neon%': '<(arm_neon)', 'sysroot%': '<(sysroot)', 'disable_sse2%': '<(disable_sse2)', @@ -254,7 +254,7 @@ # Set Thumb compilation flags. 'arm_thumb%': 0, - # Set ARM fpu compilation flags (only meaningful if armv7==1 and + # Set ARM fpu compilation flags (only meaningful if arm_version==7 and # arm_neon==0). 'arm_fpu%': 'vfpv3', @@ -980,7 +980,7 @@ '-Wa,-mimplicit-it=thumb', ] }], - ['armv7==1', { + ['arm_version==7', { 'cflags': [ '-march=armv7-a', '-mtune=cortex-a8', |