diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 04:16:47 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-20 04:16:47 +0000 |
| commit | 470a61599561d428d037acabae223bbc334ec850 (patch) | |
| tree | a21a4d8761e682f7fd9f4f2bce72aff7621110fb /third_party | |
| parent | d87ba2d2f2aa6bfc4cb6745fcf424b76f8c2c6ce (diff) | |
| download | chromium_src-470a61599561d428d037acabae223bbc334ec850.zip chromium_src-470a61599561d428d037acabae223bbc334ec850.tar.gz chromium_src-470a61599561d428d037acabae223bbc334ec850.tar.bz2 | |
Fixing Chromium ARM build break.
We don't have an ARM libvpx.a available yet, hence FFmpeg not linking.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47772 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/ffmpeg/ffmpeg.gyp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index bfe0b6f..0a6aa8a 100644 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -328,6 +328,10 @@ 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_armv5te.S', 'source/patched-ffmpeg-mt/libavcodec/arm/simple_idct_armv6.S', ], + # TODO(scherkus): Temporary until libvpx compiles on ARM. + 'sources!': [ + 'source/patched-ffmpeg-mt/libavcodec/libvpxdec.c', + ], 'conditions': [ ['arm_neon==1', { 'sources': [ @@ -386,9 +390,14 @@ ], 'libraries': [ '-lz', - '-lvpx', ], 'conditions': [ + ['target_arch!="arm"', { + 'libraries': [ + # TODO(scherkus): Temporary until libvpx compiles on ARM. + '-lvpx', + ], + }], ['ffmpeg_asm_lib==1', { 'libraries': [ # TODO(ajwong): When scons is dead, collapse this with the |