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

third_party/ffmpeg/ffmpeg.gyp

 # 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.
 
 # TODO(fbarchard): Turn off --enable-memalign-hack for all but windows.
 # TODO(ajwong): Determine if we want to statically link libz.
 
 
 
 {
@@ skipping 17 matching lines @@
   },
   'variables': {
     # Allow overridding the selection of which FFmpeg binaries to copy via an
     # environment variable.  Affects the ffmpeg_binaries target.
     'conditions': [
       ['chromeos!=0 or toolkit_views!=0', {
         'ffmpeg_branding%': '<(branding)OS',
       },{  # else chromeos==0, assume Chrome/Chromium.
         'ffmpeg_branding%': '<(branding)',
       }],
+      ['armv7==1 and arm_neon==1', {
+        # Need a separate config for arm+neon vs arm
+        'ffmpeg_config%': 'arm-neon',
+      }, {
+        'ffmpeg_config%': '<(target_arch)',
+      }],
     ],
     'ffmpeg_variant%': '<(target_arch)',
 
     'use_system_ffmpeg%': 0,
     'use_system_yasm%': 0,
 
     # Locations for generated artifacts.
     'shared_generated_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/ffmpeg',
     'asm_library': 'ffmpegasm',
   },
@@ skipping 76 matching lines @@
             'source/patched-ffmpeg-mt/libavformat/riff.c',
             'source/patched-ffmpeg-mt/libavformat/utils.c',
             'source/patched-ffmpeg-mt/libavutil/avstring.c',
             'source/patched-ffmpeg-mt/libavutil/crc.c',
             'source/patched-ffmpeg-mt/libavutil/log.c',
             'source/patched-ffmpeg-mt/libavutil/mathematics.c',
             'source/patched-ffmpeg-mt/libavutil/mem.c',
             'source/patched-ffmpeg-mt/libavutil/pixdesc.c', # TODO(fbarchard): Review this file.
             'source/patched-ffmpeg-mt/libavutil/rational.c',
             # Config file for the OS and architecture.
-            'source/config/<(ffmpeg_branding)/<(OS)/<(target_arch)/config.h',
+            'source/config/<(ffmpeg_branding)/<(OS)/<(ffmpeg_config)/config.h',
             'source/config/libavutil/avconfig.h',
           ],
           'include_dirs': [
-            'source/config/<(ffmpeg_branding)/<(OS)/<(target_arch)',
+            'source/config/<(ffmpeg_branding)/<(OS)/<(ffmpeg_config)',
             'source/patched-ffmpeg-mt',
             'source/config',
           ],
           'defines': [
             'HAVE_AV_CONFIG_H',
             '_POSIX_C_SOURCE=200112',
           ],
           'cflags': [
             '-fomit-frame-pointer',
           ],
@@ skipping 117 matching lines @@
               'cflags': [
                 '-fPIC',
               ],
             }],  # target_arch=="x64"
             ['target_arch=="arm"', {
               'defines': [
                 'PIC',
               ],
               'cflags': [
                 '-fPIC',
-                '-march=armv7-a',
-                '-mtune=cortex-a8',
-                '-mfpu=neon',
-                '-mfloat-abi=softfp',
               ],
               'sources': [
                 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_arm.S',
                 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_armv6.S',
                 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_arm.c',
                 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_armv5te.c',
                 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_armv6.c',
-                'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_neon.c',
                 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_vfp.c',
-                'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_neon.S',
                 'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_vfp.S',
                 'source/patched-ffmpeg-mt/libavcodec/arm/fft_init_arm.c', # TODO(fbarchard): Review this file.
-                'source/patched-ffmpeg-mt/libavcodec/arm/fft_neon.S', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/arm/jrevdct_arm.S',
-                'source/patched-ffmpeg-mt/libavcodec/arm/mdct_neon.S', # TODO(fbarchard): Review this file.
                 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_arm.S',
                 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_armv5te.S',
                 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_armv6.S',
-                'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_neon.S',
-                'source/patched-ffmpeg-mt/libavcodec/arm/vp3dsp_neon.S', # TODO(fbarchard): Review this file.
+              ],
+              'conditions': [
+                ['arm_neon==1', {
+                  'sources': [
+                    'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_init_neon.c',
+                    'source/patched-ffmpeg-mt/libavcodec/arm/dsputil_neon.S',
+                    'source/patched-ffmpeg-mt/libavcodec/arm/fft_neon.S', # TODO(fbarchard): Review this file.
+                    'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_neon.S',
+                    'source/patched-ffmpeg-mt/libavcodec/arm/vp3dsp_neon.S', # TODO(fbarchard): Review this file.
+                  ],
+                }],
               ],
             }],  # target_arch=="arm"
             ['target_arch=="arm" and (ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS")', {
               'sources': [
                 # TODO(fbarchard): dsputil_neon code should be used by chromium
                 # for ogg, but with h264 references only if CONFIG_H264_DECODER
                 # is enabled.
-                'source/patched-ffmpeg-mt/libavcodec/arm/h264dsp_neon.S',
-                'source/patched-ffmpeg-mt/libavcodec/arm/h264idct_neon.S',
                 'source/patched-ffmpeg-mt/libavcodec/arm/h264pred_init_arm.c',
-                'source/patched-ffmpeg-mt/libavcodec/arm/h264pred_neon.S',
                 'source/patched-ffmpeg-mt/libavcodec/arm/mpegvideo_arm.c',
                 'source/patched-ffmpeg-mt/libavcodec/arm/mpegvideo_armv5te.c',
                 'source/patched-ffmpeg-mt/libavcodec/arm/mpegvideo_armv5te_s.S',
               ],
+              'conditions': [
+                ['arm_neon==1', {
+                  'sources': [
+                    'source/patched-ffmpeg-mt/libavcodec/arm/h264dsp_neon.S',
+                    'source/patched-ffmpeg-mt/libavcodec/arm/h264idct_neon.S',
+                    'source/patched-ffmpeg-mt/libavcodec/arm/h264pred_neon.S',
+                  ],
+                }],
+              ],
             }],
            ['target_arch=="arm" and ffmpeg_branding=="ChromeOS"', {
               'sources': [
                 'source/patched-ffmpeg-mt/libavcodec/h264_mp4toannexb_bsf.c',
 # TODO(fbarchard): mpeg4video_es_bsf.c requires a patch
 #                'source/patched-ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c',
               ],
             }],  # target_arch=="arm" and ffmpeg_branding=="ChromeOS"
             ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
               'defines': [
@@ skipping 466 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: