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

Unified Diff: remoting/remoting.gyp

Issue 3005036: Implement VP8 encoder for chromoting (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: just uploading Created 10 years, 3 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/base/protocol/chromotocol.proto ('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 b0c52e25778d681ec3da90dc19df629d7dcfad09..bc1e641c3a404980f5b9bf7bd8627d4acd50f251 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -114,18 +114,15 @@
'../gfx/gfx.gyp:gfx',
'../media/media.gyp:media',
'../third_party/protobuf2/protobuf.gyp:protobuf_lite',
+ '../third_party/libvpx/libvpx.gyp:libvpx_include',
'../third_party/zlib/zlib.gyp:zlib',
'base/protocol/chromotocol.gyp:chromotocol_proto_lib',
'base/protocol/chromotocol.gyp:trace_proto_lib',
'chromoting_jingle_glue',
- # TODO(hclam): Enable VP8 in the build.
- #'third_party/on2/on2.gyp:vp8',
],
'export_dependent_settings': [
'../third_party/protobuf2/protobuf.gyp:protobuf_lite',
'base/protocol/chromotocol.gyp:chromotocol_proto_lib',
- # TODO(hclam): Enable VP8 in the build.
- #'third_party/on2/on2.gyp:vp8',
],
# This target needs a hard dependency because dependent targets
# depend on chromotocol_proto_lib for headers.
@@ -148,11 +145,10 @@
'base/encoder.h',
'base/encoder_verbatim.cc',
'base/encoder_verbatim.h',
+ 'base/encoder_vp8.cc',
+ 'base/encoder_vp8.h',
'base/encoder_zlib.cc',
'base/encoder_zlib.h',
- # TODO(hclam): Enable VP8 in the build.
- #'base/encoder_vp8.cc',
- #'base/encoder_vp8.h',
'base/multiple_array_input_stream.cc',
'base/multiple_array_input_stream.h',
'base/protocol_decoder.cc',
@@ -365,8 +361,7 @@
'base/decoder_zlib_unittest.cc',
'base/decompressor_zlib_unittest.cc',
'base/encoder_verbatim_unittest.cc',
- # TODO(hclam): Enable VP8 in the build.
- #'base/encoder_vp8_unittest.cc',
+ 'base/encoder_vp8_unittest.cc',
'base/encoder_zlib_unittest.cc',
'base/mock_objects.h',
'base/multiple_array_input_stream_unittest.cc',
« no previous file with comments | « remoting/base/protocol/chromotocol.proto ('k') | remoting/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698