diff options
| author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 01:36:37 +0000 |
|---|---|---|
| committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 01:36:37 +0000 |
| commit | e71d2e9d7750f4f387cbdf0db4e6a03426195c6e (patch) | |
| tree | cc997f9056291d5a08851062b43e70fd138e7cd6 /net/net.gyp | |
| parent | 1e543834ddfac726ca835221a2fb95432da56d7a (diff) | |
| download | chromium_src-e71d2e9d7750f4f387cbdf0db4e6a03426195c6e.zip chromium_src-e71d2e9d7750f4f387cbdf0db4e6a03426195c6e.tar.gz chromium_src-e71d2e9d7750f4f387cbdf0db4e6a03426195c6e.tar.bz2 | |
Preparing Roberto's change for landing:
http://codereview.chromium.org/1128007/show
Integrated changes for the spdy-in-memory-server from the google server side.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1526005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index 74b151d..3150839 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -944,6 +944,56 @@ }, ], 'conditions': [ + # ['OS=="linux"', { + # 'targets': [ + # { + # 'target_name': 'flip_in_mem_edsm_server', + # 'type': 'executable', + # 'dependencies': [ + # '../base/base.gyp:base', + # 'net.gyp:net', + # ], + # 'link_settings': { + # 'ldflags': [ + # '-lssl' + # ], + # 'libraries': [ + # '-lssl' + # ], + # }, + # 'sources': [ + # 'tools/flip_server/balsa_enums.h', + # 'tools/flip_server/balsa_frame.cc', + # 'tools/flip_server/balsa_frame.h', + # 'tools/flip_server/balsa_headers.cc', + # 'tools/flip_server/balsa_headers.h', + # 'tools/flip_server/balsa_headers_token_utils.cc', + # 'tools/flip_server/balsa_headers_token_utils.h', + # 'tools/flip_server/balsa_visitor_interface.h', + # 'tools/flip_server/buffer_interface.h', + # 'tools/flip_server/create_listener.cc', + # 'tools/flip_server/create_listener.h', + # 'tools/flip_server/epoll_server.cc', + # 'tools/flip_server/epoll_server.h', + # 'tools/flip_server/flip_in_mem_edsm_server.cc', + # 'tools/flip_server/http_message_constants.cc', + # 'tools/flip_server/http_message_constants.h', + # 'tools/flip_server/loadtime_measurement.h', + # 'tools/flip_server/porting.txt', + # 'tools/flip_server/ring_buffer.cc', + # 'tools/flip_server/ring_buffer.h', + # 'tools/flip_server/simple_buffer.cc', + # 'tools/flip_server/simple_buffer.h', + # 'tools/flip_server/split.h', + # 'tools/flip_server/split.cc', + # 'tools/flip_server/string_piece_utils.h', + # 'tools/flip_server/thread.h', + # 'tools/flip_server/url_to_filename_encoder.h', + # 'tools/flip_server/url_utilities.h', + # ], + # }, + # ] + # }], ['OS=="win"', { 'targets': [ { |