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/third_party/libjpeg_turbo | |
| 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/third_party/libjpeg_turbo')
| -rw-r--r-- | chromium/third_party/libjpeg_turbo/libjpeg.gyp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/chromium/third_party/libjpeg_turbo/libjpeg.gyp b/chromium/third_party/libjpeg_turbo/libjpeg.gyp index 491ede8efb0..39d5ce576b7 100644 --- a/chromium/third_party/libjpeg_turbo/libjpeg.gyp +++ b/chromium/third_party/libjpeg_turbo/libjpeg.gyp @@ -23,7 +23,8 @@ '.', ], 'defines': [ - 'WITH_SIMD', 'MOTION_JPEG_SUPPORTED', + 'WITH_SIMD', + 'MOTION_JPEG_SUPPORTED', ], 'sources': [ 'jcapimin.c', @@ -155,11 +156,11 @@ ], }], # The ARM SIMD implementation can be used for devices that support - # the NEON instruction set. This is done dynamically by probing CPU - # features at runtime, so always compile it for ARMv7-A devices. + # the NEON instruction set. This can safely be done dynamically by + # probing CPU features at runtime, if you wish. [ 'target_arch=="arm"', { 'conditions': [ - [ 'armv7 == 1 or arm_neon == 1', { + [ 'arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', { 'sources': [ 'simd/jsimd_arm.c', 'simd/jsimd_arm_neon.S', @@ -264,6 +265,11 @@ ], }, }], + [ 'OS=="android"', { + 'defines': [ + 'NO_GETENV', # getenv() is not thread-safe. + ], + }], ], 'rules': [ { |