Index: ffmpeg.gyp |
diff --git a/ffmpeg.gyp b/ffmpeg.gyp |
index 41e10a437efd8a371107b7cec457efc2a3462100..1c6c157cfa51e98d75cb165bb1cd0b7163117eed 100644 |
--- a/ffmpeg.gyp |
+++ b/ffmpeg.gyp |
@@ -166,7 +166,7 @@ |
'-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. |
@@ -192,6 +192,18 @@ |
}], |
], |
}], |
+ ['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.gy
|
+ 'cflags!': [ |
+ '-mthumb', |
Ami GONE FROM CHROMIUM
2012/05/14 18:22:53
Actually I'm surprised this CL works at all, consi
|
+ ], |
+ 'cflags': [ |
+ '-marm', |
+ '-march=armv6j', |
+ '-mtune=arm1176jzf-s', |
+ '-mfloat-abi=softfp', |
+ '-mfpu=vfp', |
+ ], |
+ }], |
['os_posix == 1 and OS != "mac"', { |
'defines': [ |
'_ISOC99_SOURCE', |