Removed assumption that any ARM build is ARMv7, fallback to ARMv6 to fix Raspberry Pi build

ffmpeg.gyp

 # Copyright (c) 2011 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.
 
 # There's a couple key GYP variables that control how FFmpeg is built:
 #   ffmpeg_branding
 #     Controls whether we build the Chromium or Google Chrome version of
 #     FFmpeg.  The Google Chrome version contains additional codecs.
 #     Typical values are Chromium, Chrome, ChromiumOS, and ChromeOS.
 #   use_system_ffmpeg
@@ skipping 148 matching lines @@
               'cflags!': [
                 '-fno-omit-frame-pointer',
               ],
               'debug_extra_cflags!': [
                 '-fno-omit-frame-pointer',
               ],
               'release_extra_cflags!': [
                 '-fno-omit-frame-pointer',
               ],
             }],  # target_arch == "ia32"
-            ['target_arch == "arm"', {
+            ['target_arch == "arm" and armv7 == 1', {
               # TODO(ihf): See the long comment in build_ffmpeg.sh
               # We want to be consistent with CrOS and have configured
               # ffmpeg for thumb. Protect yourself from -marm.
               'cflags!': [
                 '-marm',
               ],
               'cflags': [
                 '-mthumb',
                 '-march=armv7-a',
                 '-mtune=cortex-a8',
                 '-mfloat-abi=softfp',
               ],
               'conditions': [
                 ['arm_neon == 0', {
                   'cflags': [
                     '-mfpu=vfpv3-d16',
                   ],
                 }],
                 ['arm_neon == 1', {
                   'cflags': [
                     '-mfpu=neon',
                   ],
                 }],
               ],
             }],
+            ['target_arch == "arm" and armv7 == 0', {

[Ami GONE FROM CHROMIUM, 2012/05/12 15:10:14]

Would this be better placed in src/build/common.gypi?  
(I'm not sure why the above ARM stanza is here, either)

+              'cflags!': [
+                '-mthumb',

[Ami GONE FROM CHROMIUM, 2012/05/14 18:22:53]

Actually I'm surprised this CL works at all, considering build_ffmpeg.sh
hard-codes thumb, armv7, cortex-a8, etc to match l.177-190.
Are we getting lucky, or is there some reason this is working that I'm not
seeing?
(are you building against ffmpeg sources other than those generated by
build_ffmpeg.sh?)

+              ],
+              'cflags': [
+                '-marm',
+                '-march=armv6j',
+                '-mtune=arm1176jzf-s',
+                '-mfloat-abi=softfp',
+                '-mfpu=vfp',
+              ],
+            }],
             ['os_posix == 1 and OS != "mac"', {
               'defines': [
                 '_ISOC99_SOURCE',
                 '_LARGEFILE_SOURCE',
                 # BUG(ihf): ffmpeg compiles with this define. But according to
                 # ajwong: I wouldn't change _FILE_OFFSET_BITS.  That's a scary change
                 # cause it affects the default length of off_t, and fpos_t,
                 # which can cause strange problems if the loading code doesn't
                 # have it set and you start passing FILE*s or file descriptors
                 # between symbol contexts.
@@ skipping 354 matching lines @@
                   ],
                 }],
               ],
             }],
           ],  # conditions
         }],
       ],  # conditions
     },
   ],  # targets
 }