Specify -mfpu=neon for neon files

libvpx.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.
 {
   'variables': {
     'libvpx_build_vp9%': 1,
     'libvpx_source%': 'source/libvpx',
     'conditions': [
       ['os_posix==1', {
         'asm_obj_extension': 'o',
@@ skipping 31 matching lines @@
       }],
     ],
   },
   'conditions': [
     ['target_arch=="ia32"', {
       'includes': ['libvpx_srcs_x86_intrinsics.gypi', ],
     }],
     ['target_arch=="x64"', {
       'includes': ['libvpx_srcs_x86_64_intrinsics.gypi', ],
     }],
+    [ '(target_arch=="arm" or target_arch=="armv7") and arm_neon==0 and OS=="android"', {
+      # When building for targets which may not have NEON (but may!), include
+      # support for neon and hide it behind Android cpu-features.
+      'includes': ['libvpx_srcs_arm_neon_cpu_detect_intrinsics.gypi', ],
+    }],
     [ '(target_arch != "arm" and target_arch != "armv7") and target_arch != "mipsel"', {
       'targets': [
         {
           # This libvpx target contains both encoder and decoder.
           # Encoder is configured to be realtime only.
           'target_name': 'libvpx',
           'type': 'static_library',
           'variables': {
             'yasm_output_path': '<(SHARED_INTERMEDIATE_DIR)/third_party/libvpx',
             'OS_CATEGORY%': '<(OS_CATEGORY)',
@@ skipping 217 matching lines @@
             ],
           },
           'conditions': [
             # Libvpx optimizations for ARMv6 or ARMv7 without NEON.
             ['arm_neon==0', {
               'conditions': [
                 ['OS=="android"', {
                   'includes': [
                     'libvpx_srcs_arm_neon_cpu_detect.gypi',
                   ],
+                  'dependencies': [
+                    'libvpx_intrinsics_neon',
+                  ],
                   'cflags': [
                     '-Wa,-mfpu=neon',
                   ],
                 }, {
                   'includes': [
                     'libvpx_srcs_arm.gypi',
                   ],
                 }],
               ],
             }],
@@ skipping 221 matching lines @@
          # Need this otherwise gyp won't run the rule on them.
           'sources': [
             '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.o',
           ],
         }],
       ],
       'includes': ['obj_int_extract.gypi'],
     },
   ],
 }