summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorpeter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-11 18:49:58 +0000
committerpeter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-11 18:49:58 +0000
commit1c6143a6d56e62ee06dd48b7a30bc410c4172f2e (patch)
treee23e556aadc829a4b8e6d03d7d47012e3902e886 /media
parent114651a1b7f04bc4846d8e7ebe5dad4f0e51e39a (diff)
downloadchromium_src-1c6143a6d56e62ee06dd48b7a30bc410c4172f2e.zip
chromium_src-1c6143a6d56e62ee06dd48b7a30bc410c4172f2e.tar.gz
chromium_src-1c6143a6d56e62ee06dd48b7a30bc410c4172f2e.tar.bz2
Don't build webm_stream_parser.cc for Android, as it depends on ffmpeg
BUG= TEST= Review URL: http://codereview.chromium.org/9190004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117246 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/media.gyp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 00b04b8..8bfe118 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -303,6 +303,8 @@
'filters/ffmpeg_video_decoder.h',
'filters/gpu_video_decoder.cc',
'filters/gpu_video_decoder.h',
+ 'webm/webm_stream_parser.cc',
+ 'webm/webm_stream_parser.h',
],
}],
# The below 'android' condition were added temporarily and should be