From 5526773cbfbb6b9f3ef4fbec96bebc5014cf78ff Mon Sep 17 00:00:00 2001
From: "hclam@chromium.org"
 <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 1 Jul 2010 18:11:20 +0000
Subject: Zlib compressor for Chromoting

A simple implementation of compressor using zlib.

Review URL: http://codereview.chromium.org/2841032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51386 0039d316-1c4b-4281-b951-d872f2087c98
---
 remoting/remoting.gyp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'remoting/remoting.gyp')

diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index d0ad8cc..b045a62 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -72,7 +72,6 @@
         'chromoting_client',
         'chromoting_jingle_glue',
         '../third_party/ppapi/ppapi.gyp:ppapi_c',
-        '../third_party/zlib/zlib.gyp:zlib',
       ],
       'sources': [
         'client/plugin/chromoting_plugin.cc',
@@ -99,7 +98,7 @@
         }],
       ],  # end of 'conditions'
     },  # end of target 'chromoting_plugin'
-
+    
     {
       'target_name': 'chromoting_base',
       'type': '<(library)',
@@ -107,6 +106,7 @@
         '../gfx/gfx.gyp:gfx',
         '../media/media.gyp:media',
         '../third_party/protobuf2/protobuf.gyp:protobuf_lite',
+        '../third_party/zlib/zlib.gyp:zlib',
         'base/protocol/chromotocol.gyp:chromotocol_proto_lib',
         'chromoting_jingle_glue',
         # TODO(hclam): Enable VP8 in the build.
@@ -124,12 +124,15 @@
       'sources': [
         'base/constants.cc',
         'base/constants.h',
+        'base/lossless_compressor.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/compressor_zlib.cc',
+        'base/compressor_zlib.h',
       ],
     },  # end of target 'chromoting_base'
 
@@ -324,13 +327,14 @@
         '../testing/gmock/include',
       ],
       'sources': [
-        'host/client_connection_unittest.cc',
+        'base/compressor_zlib_unittest.cc',
         'base/mock_objects.h',
         'base/multiple_array_input_stream_unittest.cc',
         'base/protocol_decoder_unittest.cc',
         'client/mock_objects.h',
         'client/decoder_verbatim_unittest.cc',
         'host/chromoting_host_context_unittest.cc',
+        'host/client_connection_unittest.cc',
         'host/differ_unittest.cc',
         'host/differ_block_unittest.cc',
         'host/json_host_config_unittest.cc',
-- 
cgit v1.1