diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 00:11:07 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 00:11:07 +0000 |
| commit | 5214f719b7009c844604ffca4a24d741ec10bb6d (patch) | |
| tree | 1a031b75bf46a55ab5380c7eb85bf9ca25338f15 /media/media.gyp | |
| parent | bacc94464e429a3c650158f3d5c786752506a98c (diff) | |
| download | chromium_src-5214f719b7009c844604ffca4a24d741ec10bb6d.zip chromium_src-5214f719b7009c844604ffca4a24d741ec10bb6d.tar.gz chromium_src-5214f719b7009c844604ffca4a24d741ec10bb6d.tar.bz2 | |
Make the generated stubs weak. Enable the unittests that had conflicting symbols.
Also move some of the old mocks into their own namespace. They were causing linker confusion due to inlining or something which generated bad test executables that segfaulted.
Review URL: http://codereview.chromium.org/126170
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18457 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
| -rw-r--r-- | media/media.gyp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/media/media.gyp b/media/media.gyp index 0545788..b6c895b 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -173,20 +173,6 @@ # gtk/gtk.h '../build/linux/system.gyp:gtk', ], - 'sources!': [ - 'base/mock_ffmpeg.cc', - 'filters/ffmpeg_demuxer_unittest.cc', - 'filters/ffmpeg_glue_unittest.cc', - 'filters/ffmpeg_video_decoder_unittest.cc', - ], - }], - ['OS=="mac"', { - 'sources!': [ - 'base/mock_ffmpeg.cc', - 'filters/ffmpeg_demuxer_unittest.cc', - 'filters/ffmpeg_glue_unittest.cc', - 'filters/ffmpeg_video_decoder_unittest.cc', - ], }], ], }, |