Separate neon flags from armv7, because some platforms have armv7a but no neon.

build/common.gypi

 # Copyright (c) 2010 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   'variables': {
     # .gyp files or targets should set chromium_code to 1 if they build
@@ skipping 64 matching lines @@
       # build (0).
       'inside_chromium_build%': 1,
 
       # Set to 1 to enable fast builds. It disables debug info for fastest
       # compilation.
       'fastbuild%': 0,
 
       # Set to 1 compile with -fPIC cflag on linux. This is a must for shared
       # libraries on linux x86-64 and arm.
       'linux_fpic%': 0,
+
+      # Set ARM-v7 compilation flags
+      'armv7%': 0,
+
+      # Set Neon compilation flags (only meaningful if armv7==1).
+      'arm_neon%': 1,
     },
 
     # Define branding and buildtype on the basis of their settings within the
     # variables sub-dict above, unless overridden.
     'branding%': '<(branding)',
     'buildtype%': '<(buildtype)',
     'target_arch%': '<(target_arch)',
     'host_arch%': '<(host_arch)',
     'toolkit_views%': '<(toolkit_views)',
     'chromeos%': '<(chromeos)',
     'inside_chromium_build%': '<(inside_chromium_build)',
     'fastbuild%': '<(fastbuild)',
     'linux_fpic%': '<(linux_fpic)',
+    'armv7%': '<(armv7)',
+    'arm_neon%': '<(arm_neon)',
 
     # The release channel that this build targets. This is used to restrict
     # channel-specific build options, like which installer packages to create.
     # The default is 'all', which does no channel-specific filtering.
     'channel%': 'all',
 
     # Override chromium_mac_pch and set it to 0 to suppress the use of
     # precompiled headers on the Mac.  Prefix header injection may still be
     # used, but prefix headers will not be precompiled.  This is useful when
     # using distcc to distribute a build to compile slaves that don't
@@ skipping 84 matching lines @@
     # Enable TCMalloc.
     'linux_use_tcmalloc%': 0,
 
     # Set to select the Title Case versions of strings in GRD files.
     'use_titlecase_in_grd_files%': 0,
 
     # Used to disable Native Client at compile time, for platforms where it
     # isn't supported
     'disable_nacl%': 0,
 
-    # Set ARM-v7 compilation flags
-    'armv7%': 0,
-
     # Set Thumb compilation flags.
     'arm_thumb%': 0,
 
     'conditions': [
       ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
         # This will set gcc_version to XY if you are running gcc X.Y.*.
         # This is used to tweak build flags for gcc 4.4.
         'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
         'conditions': [
           ['branding=="Chrome" or linux_chromium_breakpad==1', {
@@ skipping 682 matching lines @@
                     # inline assembly that uses condition codes but it's
                     # suboptimal. Better would be to #ifdef __thumb__ at the
                     # right place and have a separate thumb path.
                     '-Wa,-mimplicit-it=thumb',
                     ]
                   }],
                   ['armv7==1', {
                     'cflags': [
                       '-march=armv7-a',
                       '-mtune=cortex-a8',
-                      '-mfpu=neon',
                       '-mfloat-abi=softfp',
                     ],
+                    'conditions': [
+                      ['arm_neon==1', {
+                        'cflags': [ '-mfpu=neon', ],
+                      }, {
+                        'cflags': [ '-mfpu=vfpv3', ],
+                      }]
+                    ],
                   }],
                 ],
               }],
             ],
           }],
           ['linux_fpic==1', {
             'cflags': [
               '-fPIC',
             ],
           }],
@@ skipping 296 matching lines @@
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: