diff options
| author | jfroy <jfroy@chromium.org> | 2015-04-01 10:10:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-01 17:11:41 +0000 |
| commit | 32be1d41c5fff2548c3dbe7406cc082a78b3a004 (patch) | |
| tree | c8fd2cfad9c07f7cdf168552deb738c5d0aab56f /media/media.gyp | |
| parent | f1921cb37b83bce16c07ca93975cded2b2863dd0 (diff) | |
| download | chromium_src-32be1d41c5fff2548c3dbe7406cc082a78b3a004.zip chromium_src-32be1d41c5fff2548c3dbe7406cc082a78b3a004.tar.gz chromium_src-32be1d41c5fff2548c3dbe7406cc082a78b3a004.tar.bz2 | |
Fix missing symbols for pre-linking of the Cast sender library for iOS.
When pre-linking the Cast sender library for the iOS simulator, a number
of symbols are reported as undefined, even though the functions using
them are dead code and the whole chain should disappear under dead code
elimination. The same problem does not occur when targetting iOS
hardware, which suggests a bug in the Intel linker.
This patch either defines those missing symbols or prevents their use.
Specifically, the patch adds dummy definitions for native_library and
process_metrics under iOS which do nothing, and disables the assembly
code path in yuv_convert when compiling for iOS (gyp is unable to build
the simd code properly for target_subarch=both). Otherwise yuv_convert
is functional via its normal CPU code path and is added to the
media_for_ios_cast target to support VideoFrame methods.
BUG=470602
R=miu@chromium.org
Review URL: https://codereview.chromium.org/1030253002
Cr-Commit-Position: refs/heads/master@{#323267}
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/media/media.gyp b/media/media.gyp index 3a32194..232d3fd 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -1905,10 +1905,16 @@ 'shared_memory_support', ], 'defines': [ - 'MEDIA_IMPLEMENTATION', + 'MEDIA_DISABLE_FFMPEG', + 'MEDIA_DISABLE_LIBVPX', 'MEDIA_FOR_CAST_IOS', + 'MEDIA_IMPLEMENTATION', ], 'direct_dependent_settings': { + 'defines': [ + 'MEDIA_DISABLE_FFMPEG', + 'MEDIA_DISABLE_LIBVPX', + ], 'include_dirs': [ '..', ], @@ -1924,10 +1930,20 @@ 'base/mac/video_frame_mac.h', 'base/mac/videotoolbox_glue.h', 'base/mac/videotoolbox_glue.mm', + 'base/simd/convert_rgb_to_yuv.h', + 'base/simd/convert_rgb_to_yuv_c.cc', + 'base/simd/convert_yuv_to_rgb.h', + 'base/simd/convert_yuv_to_rgb_c.cc', + 'base/simd/filter_yuv.h', + 'base/simd/filter_yuv_c.cc', 'base/video_frame.cc', 'base/video_frame.h', 'base/video_frame_metadata.cc', 'base/video_frame_metadata.h', + 'base/video_util.cc', + 'base/video_util.h', + 'base/yuv_convert.cc', + 'base/yuv_convert.h', ], 'link_settings': { 'libraries': [ |