diff options
| author | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-06 17:50:55 +0000 |
|---|---|---|
| committer | cbentzel@chromium.org <cbentzel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-06 17:50:55 +0000 |
| commit | 1453ff5f3a25d8c59149d7891aedd3c56ad547f0 (patch) | |
| tree | 8d5061a971186e672173321bacc8f0f6d3010fad /net/net.gyp | |
| parent | b3c11e615402e84dfd8d269398fa6ea1e2d6249a (diff) | |
| download | chromium_src-1453ff5f3a25d8c59149d7891aedd3c56ad547f0.zip chromium_src-1453ff5f3a25d8c59149d7891aedd3c56ad547f0.tar.gz chromium_src-1453ff5f3a25d8c59149d7891aedd3c56ad547f0.tar.bz2 | |
Revert 65313 - flip_in_mem_edsm_server builds again.
BUG=None
TEST=It builds.
Review URL: http://codereview.chromium.org/4094002
TBR=cbentzel@chromium.org
Review URL: http://codereview.chromium.org/4541002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65314 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 110 |
1 files changed, 54 insertions, 56 deletions
diff --git a/net/net.gyp b/net/net.gyp index bfc9a99..083aac4b 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1326,63 +1326,61 @@ }, ], 'conditions': [ - ['OS=="linux"', { - 'targets': [ - { - 'target_name': 'flip_in_mem_edsm_server', - 'type': 'executable', - 'dependencies': [ - '../base/base.gyp:base', - 'net.gyp:net', - ], - 'link_settings': { - 'ldflags': [ - '-lcrypto', - '-lssl' - ], - 'libraries': [ - '-lcrypto', - '-lssl' - ], - }, - 'sources': [ - 'tools/dump_cache/url_to_filename_encoder.cc', - 'tools/dump_cache/url_to_filename_encoder.h', - 'tools/dump_cache/url_utilities.h', - 'tools/dump_cache/url_utilities.cc', + # ['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/dump_cache/url_to_filename_encoder.cc', + # 'tools/dump_cache/url_to_filename_encoder.h', + # 'tools/dump_cache/url_utilities.h', + # 'tools/dump_cache/url_utilities.cc', - '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', - ], - }, - ] - }], + # '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': [ { |