Break out balsa and epoll_server from net/tools/flip_server.

net/net.gyp

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'use_tracing_cache_backend%': 0,
@@ skipping 1885 matching lines @@
         'websockets/websocket_frame_test.cc',
         'websockets/websocket_handshake_handler_test.cc',
         'websockets/websocket_handshake_handler_spdy_test.cc',
         'websockets/websocket_job_test.cc',
         'websockets/websocket_net_log_params_test.cc',
         'websockets/websocket_throttle_test.cc',
       ],
       'conditions': [
         ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
           'dependencies': [
+            'balsa_library',

[Ryan Sleevi, 2013/09/27 19:39:21]

Editorial question: Why the suffix "_library"? Most of Chromium's GYP files
don't make this distinction here.

Same applies for "quic_library", in that sense.

Are these truly meant to be standalone (eg: no dependents on Chromium at all?)
Would we be better moving them to a third_party style directory, the same way
that we do other Google-internally-developed-but-opensourced-libraries?

[Ryan Hamilton, 2013/09/27 19:55:36]

Hm.  I'll give you the history first, and then we can see if we can figure out
better names.  So in flip_server, we have/had:

* the "core" flip code - in the flip_server__library target
* the actual flip_server binary - in the flip_server target
* the tests - in a flip_server_test target

net/tools/quic was similar.  We had core, tests, and client/server.  At some
point, we realized that the tests were not being run from the tree and decided
to fold them into net_unittests.  This is unmitigated goodness, as far as I can
tell :>

I'd be happy to use a different naming convention.  For the binaries we could
use
quic_client, quic_server, flip_server (well, really _in_mem_edsm_, but
whatever).  Cool?

But what would you suggest for the core? quic_support/flip_support? _tools? 
something else?

Happy to rename balsa_library to "balsa" and "epoll_server_library" to
"epoll_server" if you prefer?
flip and quic are definitely not intended to be standalone.  balsa and epoll are
not intended to be supported for use by third parties, though they don't have
any direct dependencies on chromium.

+            'epoll_server_library',
+            'flip_in_mem_edsm_server_library',
             'quic_library',
-            'flip_in_mem_edsm_server_library',
-            'flip_balsa_and_epoll_library',
           ],
           'sources': [
-            'tools/flip_server/balsa_frame_test.cc',
-            'tools/flip_server/balsa_headers_test.cc',
+            'tools/balsa/balsa_frame_test.cc',
+            'tools/balsa/balsa_headers_test.cc',
             'tools/flip_server/flip_test_utils.cc',
             'tools/flip_server/flip_test_utils.h',
             'tools/flip_server/http_interface_test.cc',
             'tools/flip_server/mem_cache_test.cc',
-            'tools/flip_server/simple_buffer.cc',
-            'tools/flip_server/simple_buffer.h',
             'tools/flip_server/spdy_interface_test.cc',
             'tools/quic/end_to_end_test.cc',
             'tools/quic/quic_client_session_test.cc',
             'tools/quic/quic_dispatcher_test.cc',
             'tools/quic/quic_epoll_clock_test.cc',
             'tools/quic/quic_epoll_connection_helper_test.cc',
             'tools/quic/quic_in_memory_cache_test.cc',
             'tools/quic/quic_reliable_client_stream_test.cc',
             'tools/quic/quic_reliable_server_stream_test.cc',
             'tools/quic/quic_server_session_test.cc',
@@ skipping 706 matching lines @@
             'tools/tld_cleanup/tld_cleanup.cc',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
         },
       ],
     }],
     ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
       'targets': [
         {
-          'target_name': 'flip_balsa_and_epoll_library',
+          'target_name': 'balsa_library',
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
             'net',
           ],
           '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/constants.h',
-            'tools/flip_server/epoll_server.cc',
-            'tools/flip_server/epoll_server.h',
-            'tools/flip_server/http_message_constants.cc',
-            'tools/flip_server/http_message_constants.h',
-            'tools/flip_server/split.h',
-            'tools/flip_server/split.cc',
+            'tools/balsa/balsa_enums.h',
+            'tools/balsa/balsa_frame.cc',
+            'tools/balsa/balsa_frame.h',
+            'tools/balsa/balsa_headers.cc',
+            'tools/balsa/balsa_headers.h',
+            'tools/balsa/balsa_headers_token_utils.cc',
+            'tools/balsa/balsa_headers_token_utils.h',
+            'tools/balsa/balsa_visitor_interface.h',
+            'tools/balsa/http_message_constants.cc',
+            'tools/balsa/http_message_constants.h',
+            'tools/balsa/simple_buffer.cc',
+            'tools/balsa/simple_buffer.h',
+            'tools/balsa/split.cc',
+            'tools/balsa/split.h',
           ],
         },
         {
+          'target_name': 'epoll_server_library',
+          'type': 'static_library',
+          'dependencies': [
+            '../base/base.gyp:base',
+            'net',
+          ],
+          'sources': [
+            'tools/epoll_server/epoll_server.cc',
+            'tools/epoll_server/epoll_server.h',
+          ],
+        },
+        {
           'target_name': 'flip_in_mem_edsm_server_library',
           'type': 'static_library',
           'cflags': [
             '-Wno-deprecated',
           ],
           'dependencies': [
             '../base/base.gyp:base',
             '../third_party/openssl/openssl.gyp:openssl',
-            'flip_balsa_and_epoll_library',
+            'balsa_library',
+            'epoll_server_library',
             'net',
           ],
           '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/acceptor_thread.h',
             'tools/flip_server/acceptor_thread.cc',
-            'tools/flip_server/buffer_interface.h',
             'tools/flip_server/create_listener.cc',
             'tools/flip_server/create_listener.h',
+            'tools/flip_server/constants.h',
             'tools/flip_server/flip_config.cc',
             'tools/flip_server/flip_config.h',
             'tools/flip_server/http_interface.cc',
             'tools/flip_server/http_interface.h',
             'tools/flip_server/loadtime_measurement.h',
             'tools/flip_server/mem_cache.h',
             'tools/flip_server/mem_cache.cc',
             'tools/flip_server/output_ordering.cc',
             'tools/flip_server/output_ordering.h',
             '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/sm_connection.cc',
             'tools/flip_server/sm_connection.h',
             'tools/flip_server/sm_interface.h',
             'tools/flip_server/spdy_ssl.cc',
             'tools/flip_server/spdy_ssl.h',
             'tools/flip_server/spdy_interface.cc',
             'tools/flip_server/spdy_interface.h',
             'tools/flip_server/spdy_util.cc',
             'tools/flip_server/spdy_util.h',
             'tools/flip_server/streamer_interface.cc',
             'tools/flip_server/streamer_interface.h',
             'tools/flip_server/string_piece_utils.h',
           ],
         },
         {
           'target_name': 'flip_in_mem_edsm_server',
           'type': 'executable',
           'cflags': [
             '-Wno-deprecated',
           ],
           'dependencies': [
             '../base/base.gyp:base',
-            'flip_balsa_and_epoll_library',
             'flip_in_mem_edsm_server_library',
             'net',
           ],
           'sources': [
             'tools/flip_server/flip_in_mem_edsm_server.cc',
           ],
         },
         {
           'target_name': 'quic_library',
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../crypto/crypto.gyp:crypto',
             '../third_party/openssl/openssl.gyp:openssl',
             '../url/url.gyp:url_lib',
-            'flip_balsa_and_epoll_library',
+            'balsa_library',
+            'epoll_server_library',
             'net',
           ],
           'sources': [
             'tools/quic/quic_client.cc',
             'tools/quic/quic_client.h',
             'tools/quic/quic_client_session.cc',
             'tools/quic/quic_client_session.h',
             'tools/quic/quic_dispatcher.h',
             'tools/quic/quic_dispatcher.cc',
             'tools/quic/quic_epoll_clock.cc',
@@ skipping 224 matching lines @@
             'net_unittests.isolate',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }