Temporarily revert "update neon config in libjpeg turbo"

libjpeg.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   # This file is not used when use_system_libjepg==1. Settings for building with
   # the system libjpeg is in third_party/libjpeg/libjpeg.gyp.
   'variables': {
     'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libjpeg_turbo',
     'conditions': [
@@ skipping 139 matching lines @@
             'simd/jfss2fst-64.asm',
             'simd/jfss2int-64.asm',
             'simd/jfsseflt-64.asm',
             'simd/jiss2flt-64.asm',
             'simd/jiss2fst-64.asm',
             'simd/jiss2int-64.asm',
             'simd/jiss2red-64.asm',
           ],
         }],
         # 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',
               ],
             }, {
               'sources': [
                 'jsimd_none.c',
               ],
             }]
           ],
@@ skipping 120 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: