diff options
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 716b3e2..bcde3f5 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -116,9 +116,11 @@ '../third_party/protobuf/protobuf.gyp:protobuf_lite', '../third_party/libvpx/libvpx.gyp:libvpx_include', '../third_party/zlib/zlib.gyp:zlib', + 'chromoting_jingle_glue', '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/protobuf/protobuf.gyp:protobuf_lite', @@ -154,13 +156,11 @@ 'base/encoder_zlib.h', 'base/multiple_array_input_stream.cc', 'base/multiple_array_input_stream.h', - 'base/protocol_decoder.cc', - 'base/protocol_decoder.h', - 'base/protocol_util.cc', - 'base/protocol_util.h', 'base/tracer.cc', 'base/tracer.h', 'base/types.h', + 'base/util.cc', + 'base/util.h', ], }, # end of target 'chromoting_base' @@ -170,6 +170,7 @@ 'dependencies': [ 'chromoting_base', 'chromoting_jingle_glue', + 'chromoting_protocol', ], 'sources': [ 'host/access_verifier.cc', @@ -241,6 +242,7 @@ 'dependencies': [ 'chromoting_base', 'chromoting_jingle_glue', + 'chromoting_protocol', ], 'sources': [ 'client/chromoting_client.cc', @@ -358,12 +360,22 @@ 'chromoting_jingle_glue', ], 'sources': [ + 'protocol/messages_decoder.cc', + 'protocol/messages_decoder.h', + 'protocol/buffered_socket_writer.cc', + 'protocol/buffered_socket_writer.h', 'protocol/chromoting_connection.h', 'protocol/chromoting_server.h', 'protocol/jingle_chromoting_connection.cc', 'protocol/jingle_chromoting_connection.h', 'protocol/jingle_chromoting_server.cc', 'protocol/jingle_chromoting_server.h', + 'protocol/stream_reader.cc', + 'protocol/stream_reader.h', + 'protocol/stream_writer.cc', + 'protocol/stream_writer.h', + 'protocol/util.cc', + 'protocol/util.h', ], }, # end of target 'chromoting_protocol' @@ -411,7 +423,6 @@ # BUG57351 'base/encoder_zlib_unittest.cc', 'base/mock_objects.h', 'base/multiple_array_input_stream_unittest.cc', -# BUG57351 'base/protocol_decoder_unittest.cc', # BUG57351 'client/chromoting_view_unittest.cc', 'client/mock_objects.h', 'host/access_verifier_unittest.cc', @@ -433,6 +444,9 @@ 'jingle_glue/mock_objects.h', 'jingle_glue/stream_socket_adapter_unittest.cc', 'protocol/jingle_chromoting_connection_unittest.cc', + 'protocol/messages_decoder_unittest.cc', + 'protocol/fake_connection.cc', + 'protocol/fake_connection.h', 'protocol/session_manager_pair.cc', 'protocol/session_manager_pair.h', 'run_all_unittests.cc', |