Building FFmpeg in tree for arm

Changes yasm to be built for host instead of target.
Also don't need to depend on yasm if build ing for arm.

Review URL: http://codereview.chromium.org/387023

git-svn-id: http://src.chromium.org/svn/trunk/src/build@31929 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

all.gyp

@@ -58,8 +58,8 @@
         }],
         ['OS=="mac" or OS=="linux" or OS=="freebsd"', {
           'dependencies': [
-            '../third_party/yasm/yasm.gyp:*',
-          ],
+            '../third_party/yasm/yasm.gyp:*#host',
+           ],
         }],
         ['OS=="mac"', {
           'dependencies': [

common.gypi

@@ -672,13 +672,17 @@
             ],
           }],
           ['target_arch=="arm"', {
-            'target_conditions': [
-              ['armv7==1 and _toolset=="target"', {
-                'cflags': [
-                  '-march=armv7-a',
-                  '-mtune=cortex-a8',
-                  '-mfpu=neon',
-                  '-mfloat-abi=softfp',
+            'conditions': [
+              ['armv7==1', {
+                'target_conditions': [
+                  ['_toolset=="target"', {
+                    'cflags': [
+                      '-march=armv7-a',
+                      '-mtune=cortex-a8',
+                      '-mfpu=neon',
+                      '-mfloat-abi=softfp',
+                    ],
+                  }],
                 ],
               }],
             ],