Revert the previous 2 temporary changes.

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': [
       [ 'OS=="win"', {
         'object_suffix': 'obj',
       }, {
         'object_suffix': 'o',
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'libjpeg',
       'type': 'static_library',
       'include_dirs': [
         '.',
       ],
       'defines': [
         'WITH_SIMD',
         'MOTION_JPEG_SUPPORTED',
+        'NO_GETENV',
       ],
       'sources': [
         'jcapimin.c',
         'jcapistd.c',
         'jccoefct.c',
         'jccolor.c',
         'jcdctmgr.c',
         'jchuff.c',
         'jchuff.h',
         'jcinit.c',
@@ skipping 111 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 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',
               ],
             }, {
               'sources': [
                 'jsimd_none.c',
               ],
             }]
           ],
@@ skipping 84 matching lines @@
                 'yasm_format': '-felf64',
                 'yasm_flags': [
                   '-D__x86_64__',
                   '-DELF',
                   '-Ilinux/'
                 ],
               }],
             ],
           },
         }],
-        [ 'OS=="android"', {
-          'defines': [
-            'NO_GETENV',  # getenv() is not thread-safe.
-          ],
-        }],
       ],
       'rules': [
         {
           'rule_name': 'assemble',
           'extension': 'asm',
           'conditions': [
             [ 'target_arch!="arm"', {
               'inputs': [ '<(yasm_path)', ],
               'outputs': [
                 '<(shared_generated_dir)/<(RULE_INPUT_ROOT).<(object_suffix)',
@@ skipping 16 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: