Remove NEON runtime detection support.

gyp/opts.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # Gyp file for building opts target.
 {
   # Source lists live in opts.gypi.  This makes it easier to maintain our Chrome GYP/GN setup.
   # (To be honest, I'm not sure why we need to include common.gypi.  I thought it was automatic.)
   'variables': {
     'includes': [ 'common.gypi', 'opts.gypi' ],
@@ skipping 43 matching lines @@
                 and skia_arch_type not in ["x86", "x86_64", "arm", "mips", \
                                            "arm64"])', {
           'sources': [ '<@(none_sources)' ],
         }],
 
         [ 'skia_arch_type == "arm" and arm_version >= 7', {
           # The assembly uses the frame pointer register (r7 in Thumb/r11 in
           # ARM), the compiler doesn't like that.
           'cflags!': [ '-fno-omit-frame-pointer', '-mapcs-frame', '-mapcs' ],
           'cflags':  [ '-fomit-frame-pointer' ],
-          'variables': { 'arm_neon_optional%': '<(arm_neon_optional>' },
           'sources': [ '<@(armv7_sources)' ],
           'conditions': [
-            [ 'arm_neon == 1 or arm_neon_optional == 1', {
+            [ 'arm_neon == 1', {
               'dependencies': [ 'opts_neon' ]
             }],
           ],
         }],
 
         [ 'skia_arch_type == "arm64"', {
           'sources': [ '<@(arm64_sources)' ],
         }],
 
         [ 'skia_android_framework', {
@@ skipping 124 matching lines @@
           ],
         }],
       ],
       'ldflags': [
         '-march=armv7-a',
         '-Wl,--fix-cortex-a8',
       ],
     },
   ],
 }