diff options
| author | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-30 11:33:03 +0000 |
|---|---|---|
| committer | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-30 11:33:03 +0000 |
| commit | 793ad11f0e412565922c34d6a749fc26a05b391c (patch) | |
| tree | 6b30682889cfd75ac7d2ccd9e850c45a9bc17732 /webkit/media | |
| parent | af2abbbdef007cf95f9ab6a5494dd58fd1b9c98f (diff) | |
| download | chromium_src-793ad11f0e412565922c34d6a749fc26a05b391c.zip chromium_src-793ad11f0e412565922c34d6a749fc26a05b391c.tar.gz chromium_src-793ad11f0e412565922c34d6a749fc26a05b391c.tar.bz2 | |
Fix WebMediaPlayer-related linking errors for Android
This patch fixes linking errors related to the WebMediaPlayer implementation
in webkit/media/ by excluding the default implementation from the build (which
also relies on ffmpeg), and returning NULL in CreateMediaPlayer.
BUG=
TEST=
Review URL: http://codereview.chromium.org/8958004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116042 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/webkit_media.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi index 1fc0753..97d4a67 100644 --- a/webkit/media/webkit_media.gypi +++ b/webkit/media/webkit_media.gypi @@ -49,6 +49,8 @@ ['OS=="android"', { 'sources!': [ 'audio_decoder.cc', + 'webmediaplayer_impl.cc', + 'webmediaplayer_impl.h', ], }], ], |