diff options
| author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2013-12-09 23:08:30 +0000 |
|---|---|---|
| committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2013-12-09 23:08:30 +0000 |
| commit | b8888bc4a1f08162521ad34393f99d069483483a (patch) | |
| tree | 99ec038325cea361f070dde92de5ff1b9d8c6d1f | |
| parent | e81fceb30c7cc407b0dcb3e44c4e518fc14bae61 (diff) | |
| download | libjpeg_turbo-b8888bc4a1f08162521ad34393f99d069483483a.tar.gz | |
Temporarily revert "update neon config in libjpeg turbo"
This is for rolling the NO_GETENV change into m32.
Will revert this change asap after it is submitted.
This reverts commit 9652949c7866f976393848990dbebbd873f5f43f.
BUG=322228
TBR=
Review URL: https://codereview.chromium.org/110853003
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@239591 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
| -rw-r--r-- | libjpeg.gyp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libjpeg.gyp b/libjpeg.gyp index 39d5ce5..4880c30 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -156,11 +156,11 @@ ], }], # The ARM SIMD implementation can be used for devices that support - # the NEON instruction set. This can safely be done dynamically by - # probing CPU features at runtime, if you wish. + # the NEON instruction set. This is done dynamically by probing CPU + # features at runtime, so always compile it for ARMv7-A devices. [ 'target_arch=="arm"', { 'conditions': [ - [ 'arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', { + [ 'armv7 == 1 or arm_neon == 1', { 'sources': [ 'simd/jsimd_arm.c', 'simd/jsimd_arm_neon.S', |