Remove NEON runtime detection support.

gyp/libjpeg-turbo.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.
 
 {
   'xcode_settings': {
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
   'variables': {
     'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/externals/libjpeg-turbo',
@@ skipping 111 matching lines @@
       'conditions': [
         # TODO (msarett): Is it possible to enable cross compiling for Android on other platforms?
         [ 'skia_os == "android" and host_os != "linux" and "x86" in skia_arch_type', {
            'sources': [
              '../third_party/externals/libjpeg-turbo/jsimd_none.c',
            ],
         }],
         [ 'skia_arch_type == "x86" and (skia_os != "android" or host_os == "linux")', {
           'sources': [
             '../third_party/externals/libjpeg-turbo/simd/jsimd_i386.c',
-            '../third_party/externals/libjpeg-turbo/simd/jccolor-mmx.asm', 
+            '../third_party/externals/libjpeg-turbo/simd/jccolor-mmx.asm',
             '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2.asm',
-            '../third_party/externals/libjpeg-turbo/simd/jcgray-mmx.asm',  
+            '../third_party/externals/libjpeg-turbo/simd/jcgray-mmx.asm',
             '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2.asm',
-            '../third_party/externals/libjpeg-turbo/simd/jchuff-sse2.asm', 
+            '../third_party/externals/libjpeg-turbo/simd/jchuff-sse2.asm',
             '../third_party/externals/libjpeg-turbo/simd/jcsample-mmx.asm',
             '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2.asm',
-            '../third_party/externals/libjpeg-turbo/simd/jdcolor-mmx.asm', 
+            '../third_party/externals/libjpeg-turbo/simd/jdcolor-mmx.asm',
             '../third_party/externals/libjpeg-turbo/simd/jdcolor-sse2.asm',
-            '../third_party/externals/libjpeg-turbo/simd/jdmerge-mmx.asm', 
+            '../third_party/externals/libjpeg-turbo/simd/jdmerge-mmx.asm',
             '../third_party/externals/libjpeg-turbo/simd/jdmerge-sse2.asm',
             '../third_party/externals/libjpeg-turbo/simd/jdsample-mmx.asm',
             '../third_party/externals/libjpeg-turbo/simd/jdsample-sse2.asm',
             '../third_party/externals/libjpeg-turbo/simd/jfdctflt-3dn.asm',
             '../third_party/externals/libjpeg-turbo/simd/jfdctflt-sse.asm',
             '../third_party/externals/libjpeg-turbo/simd/jfdctfst-mmx.asm',
             '../third_party/externals/libjpeg-turbo/simd/jfdctfst-sse2.asm',
             '../third_party/externals/libjpeg-turbo/simd/jfdctint-mmx.asm',
             '../third_party/externals/libjpeg-turbo/simd/jfdctint-sse2.asm',
             '../third_party/externals/libjpeg-turbo/simd/jidctflt-3dn.asm',
             '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse2.asm',
             '../third_party/externals/libjpeg-turbo/simd/jidctflt-sse.asm',
             '../third_party/externals/libjpeg-turbo/simd/jidctfst-mmx.asm',
             '../third_party/externals/libjpeg-turbo/simd/jidctfst-sse2.asm',
             '../third_party/externals/libjpeg-turbo/simd/jidctint-mmx.asm',
             '../third_party/externals/libjpeg-turbo/simd/jidctint-sse2.asm',
             '../third_party/externals/libjpeg-turbo/simd/jidctred-mmx.asm',
             '../third_party/externals/libjpeg-turbo/simd/jidctred-sse2.asm',
-            '../third_party/externals/libjpeg-turbo/simd/jquant-3dn.asm',  
+            '../third_party/externals/libjpeg-turbo/simd/jquant-3dn.asm',
             '../third_party/externals/libjpeg-turbo/simd/jquantf-sse2.asm',
             '../third_party/externals/libjpeg-turbo/simd/jquanti-sse2.asm',
-            '../third_party/externals/libjpeg-turbo/simd/jquant-mmx.asm',  
-            '../third_party/externals/libjpeg-turbo/simd/jquant-sse.asm',  
+            '../third_party/externals/libjpeg-turbo/simd/jquant-mmx.asm',
+            '../third_party/externals/libjpeg-turbo/simd/jquant-sse.asm',
             '../third_party/externals/libjpeg-turbo/simd/jsimdcpu.asm',
           ],
         }],
         [ 'skia_arch_type == "x86_64" and (skia_os != "android" or host_os == "linux")', {
           'sources': [
             '../third_party/externals/libjpeg-turbo/simd/jsimd_x86_64.c',
             '../third_party/externals/libjpeg-turbo/simd/jccolor-sse2-64.asm',
             '../third_party/externals/libjpeg-turbo/simd/jcgray-sse2-64.asm',
             '../third_party/externals/libjpeg-turbo/simd/jchuff-sse2-64.asm',
             '../third_party/externals/libjpeg-turbo/simd/jcsample-sse2-64.asm',
@@ skipping 12 matching lines @@
           ],
         }],
         [ 'skia_arch_type == "arm64"', {
           'sources': [
             '../third_party/externals/libjpeg-turbo/simd/jsimd_arm64.c',
             '../third_party/externals/libjpeg-turbo/simd/jsimd_arm64_neon.S',
           ],
         }],
         [ 'skia_arch_type == "arm"', {
           'conditions': [
-            [ 'arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', {
+            [ 'arm_version >= 7 and arm_neon == 1', {
               'sources': [
                 '../third_party/externals/libjpeg-turbo/simd/jsimd_arm.c',
                 '../third_party/externals/libjpeg-turbo/simd/jsimd_arm_neon.S',
               ],
             }, {
               'sources': [
                 '../third_party/externals/libjpeg-turbo/jsimd_none.c',
               ],
             }],
           ],
         }],
         # mips simd is supported in later versions of libjpeg-turbo.  If we
         # choose to update our copy of libjpeg-turbo we can enable mips simd.
         [ '"mips" in skia_arch_type', {
           'sources': [
             '../third_party/externals/libjpeg-turbo/jsimd_none.c',
           ],
         }],
-      
+
         # Build rules for an asm file.
         # On Windows, we use the precompiled yasm binary.
         # On Linux, we build our patched yasm and use it.
         # On Mac, we always build our patched yasm and use it.
         [ 'skia_os == "win"', {
           'dependencies': [
             'yasm-win',
           ],
           'defines': [
             'TURBO_FOR_WINDOWS',
@@ skipping 115 matching lines @@
               ],
               'process_outputs_as_sources': 1,
               'message': 'Building <(RULE_INPUT_ROOT).<(object_suffix)',
             }],
           ]
         },
       ],
     },
   ],
 }