diff options
| author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2013-12-09 23:16:08 +0000 |
|---|---|---|
| committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | 2013-12-09 23:16:08 +0000 |
| commit | 7220379786c6b814b6b887478fa440bb392e8251 (patch) | |
| tree | 5d1cf45b70877d986e50e3036d8b83812a58ac94 | |
| parent | b8888bc4a1f08162521ad34393f99d069483483a (diff) | |
| download | libjpeg_turbo-7220379786c6b814b6b887478fa440bb392e8251.tar.gz | |
Revert the previous 2 temporary changes.
Reverted r239283 (Temporary limit NO_GETENV on Android only)
and r239591 (Temporary revert "update neon config in libjpeg turbo".
Will roll m32 libjpeg_turbo to r239591.
BUG=322228
TBR=
Review URL: https://codereview.chromium.org/108273007
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libjpeg_turbo@239595 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
| -rw-r--r-- | libjpeg.gyp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libjpeg.gyp b/libjpeg.gyp index 4880c30..03dc537 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -25,6 +25,7 @@ 'defines': [ 'WITH_SIMD', 'MOTION_JPEG_SUPPORTED', + 'NO_GETENV', ], 'sources': [ 'jcapimin.c', @@ -156,11 +157,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', @@ -265,11 +266,6 @@ ], }, }], - [ 'OS=="android"', { - 'defines': [ - 'NO_GETENV', # getenv() is not thread-safe. - ], - }], ], 'rules': [ { |