diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-13 19:30:25 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-13 19:30:25 +0000 |
| commit | dc9711fe5e00639471fd0edf195a4ada4f7d994d (patch) | |
| tree | dba32da9b4a33e5d22c3299c75c511198532f396 /build | |
| parent | b9f9383602610ef1f94e9bee2d91d7c044e16051 (diff) | |
| download | chromium_src-dc9711fe5e00639471fd0edf195a4ada4f7d994d.zip chromium_src-dc9711fe5e00639471fd0edf195a4ada4f7d994d.tar.gz chromium_src-dc9711fe5e00639471fd0edf195a4ada4f7d994d.tar.bz2 | |
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: svn://svn.chromium.org/chrome/trunk/src@31929 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 4 | ||||
| -rw-r--r-- | build/common.gypi | 18 |
2 files changed, 13 insertions, 9 deletions
diff --git a/build/all.gyp b/build/all.gyp index f19cc9f..81ae757 100644 --- a/build/all.gyp +++ b/build/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': [ diff --git a/build/common.gypi b/build/common.gypi index 36a218a..34f9f25 100644 --- a/build/common.gypi +++ b/build/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', + ], + }], ], }], ], |