Ignore arm_neon_optional if arm_neon==1 in skia.

skia/skia_common.gypi

 # Copyright 2013 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 gypi file handles the removal of platform-specific files from the
 # Skia build.
 {
   'includes': [
     # blink_skia_config.gypi defines blink_skia_defines
     '../third_party/WebKit/public/blink_skia_config.gypi',
@@ skipping 81 matching lines @@
         'SK_HIGH_QUALITY_IS_LANCZOS',
       ],
     }],
 
     # Neon support.
     [ 'target_arch == "arm" and arm_version >= 7 and arm_neon == 1', {
       'defines': [
         'SK_ARM_HAS_NEON',
       ],
     }],
-    [ 'target_arch == "arm" and arm_version >= 7 and arm_neon_optional == 1', {
+    [ 'target_arch == "arm" and arm_version >= 7 and arm_neon == 0 and arm_neon_optional == 1', {
       'defines': [
         'SK_ARM_HAS_OPTIONAL_NEON',
       ],
     }],
   ],
 
   'variables': {
     'variables': {
       'conditions': [
         ['OS== "ios"', {
@@ skipping 61 matching lines @@
   # re-export if they include Skia headers in their public headers.
   'all_dependent_settings': {
     'include_dirs': [
       '..',
       'config',
     ],
   },
 
   'msvs_disabled_warnings': [4244, 4267, 4341, 4345, 4390, 4554, 4748, 4800],
 }