diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 04:05:59 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 04:05:59 +0000 |
| commit | c34e8e6d67280bd98da7b9156d9c1040cc3e358b (patch) | |
| tree | 23c06a54a2f00f8e9be0105a9e0def6c624e2145 /remoting/remoting.gyp | |
| parent | 845d8f57c624bcc8aec50c5b50e2e65946c2e66c (diff) | |
| download | chromium_src-c34e8e6d67280bd98da7b9156d9c1040cc3e358b.zip chromium_src-c34e8e6d67280bd98da7b9156d9c1040cc3e358b.tar.gz chromium_src-c34e8e6d67280bd98da7b9156d9c1040cc3e358b.tar.bz2 | |
Roll ffmpeg/libvpx deps to switch to ffvp8.
BUG=50811
TEST=remoting_unittests, media_unittests, layout tests
Review URL: http://codereview.chromium.org/7657005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 6c18ec9..4ec741e 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -165,7 +165,6 @@ 'remoting_base', 'remoting_host', 'remoting_jingle_glue', - '../third_party/libvpx/libvpx.gyp:libvpx', '../third_party/npapi/npapi.gyp:npapi', ], 'sources': [ @@ -285,14 +284,13 @@ '../ui/ui.gyp:ui', '../net/net.gyp:net', '../skia/skia.gyp:skia', + '../third_party/libvpx/libvpx.gyp:libvpx', '../third_party/protobuf/protobuf.gyp:protobuf_lite', '../third_party/zlib/zlib.gyp:zlib', '../media/media.gyp:yuv_convert', 'remoting_jingle_glue', 'proto/chromotocol.gyp:chromotocol_proto_lib', 'proto/trace.gyp:trace_proto_lib', - # TODO(hclam): Enable VP8 in the build. - #'third_party/on2/on2.gyp:vp8', ], 'export_dependent_settings': [ '../base/base.gyp:base', @@ -301,11 +299,6 @@ '../third_party/protobuf/protobuf.gyp:protobuf_lite', 'proto/chromotocol.gyp:chromotocol_proto_lib', ], - # TODO(hclam): Remove this and depend on libvpx directly once we remove - # libvpx from FFmpeg. - 'include_dirs': [ - '../third_party/libvpx/source/libvpx', - ], # This target needs a hard dependency because dependent targets # depend on chromotocol_proto_lib for headers. 'hard_dependency': 1, |