Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1308)

Unified Diff: remoting/remoting.gyp

Issue 7657005: Roll ffmpeg/libvpx deps to switch to ffvp8. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: new libvpx Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/simple_host_process.cc ('k') | remoting/run_all_unittests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting.gyp
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 6c18ec9459388f57c4f6679bc3d96c2bac368555..4ec741e15bdecf6529f0e13eecab267c9085fd44 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,
« no previous file with comments | « remoting/host/simple_host_process.cc ('k') | remoting/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698