Revert 98885 - Third attempt at the following. Unreviewed, this was originally reviewed in http:...

net/net.gyp

 # Copyright (c) 2011 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,
     'conditions': [
@@ skipping 187 matching lines @@
         'base/ssl_cert_request_info.h',
         'base/ssl_cipher_suite_names.cc',
         'base/ssl_cipher_suite_names.h',
         'base/ssl_client_auth_cache.cc',
         'base/ssl_client_auth_cache.h',
         'base/ssl_config_service.cc',
         'base/ssl_config_service.h',
         'base/ssl_config_service_defaults.cc',
         'base/ssl_config_service_defaults.h',
         'base/ssl_false_start_blacklist.cc',
-        'base/ssl_false_start_blacklist.h',
         'base/ssl_info.cc',
         'base/ssl_info.h',
         'base/static_cookie_policy.cc',
         'base/static_cookie_policy.h',
         'base/test_data_stream.cc',
         'base/test_data_stream.h',
         'base/test_root_certs.cc',
         'base/test_root_certs.h',
         'base/test_root_certs_mac.cc',
         'base/test_root_certs_nss.cc',
@@ skipping 1168 matching lines @@
         '../base/base.gyp:base',
       ],
       'sources': [
         'tools/dnssec_chain_verify/dnssec_chain_verify.cc',
       ]
     },
     {
       'target_name': 'ssl_false_start_blacklist_process',
       'type': 'executable',
       'toolsets': ['host'],
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-      ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'base/ssl_false_start_blacklist_process.cc',
-        'base/ssl_false_start_blacklist.h',
       ],
     },
   ],
   'conditions': [
      ['os_posix == 1 and OS != "mac"', {
        'targets': [
          {
            'target_name': 'flip_in_mem_edsm_server',
            'type': 'executable',
            'cflags': [
              '-Wno-deprecated',
            ],
            'dependencies': [
              '../base/base.gyp:base',
-             'net',
+             'net.gyp:net',
              '../third_party/openssl/openssl.gyp:openssl',
            ],
            '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',
@@ skipping 41 matching lines @@
              'tools/flip_server/streamer_interface.cc',
              'tools/flip_server/streamer_interface.h',
              'tools/flip_server/string_piece_utils.h',
            ],
          },
          {
            'target_name': 'curvecp',
            'type': 'static_library',
            'dependencies': [
              '../base/base.gyp:base',
-             'net',
+             'net.gyp:net',
            ],
            'sources': [
              'curvecp/circular_buffer.cc',
              'curvecp/circular_buffer.h',
              'curvecp/client_packetizer.cc',
              'curvecp/client_packetizer.h',
              'curvecp/connection_key.cc',
              'curvecp/connection_key.h',
              'curvecp/curvecp_client_socket.cc',
              'curvecp/curvecp_client_socket.h',
@@ skipping 14 matching lines @@
              'curvecp/server_messenger.h',
              'curvecp/server_packetizer.cc',
              'curvecp/server_packetizer.h',
            ],
          },
          {
            'target_name': 'curvecp_unittests',
            'type': 'executable',
            'dependencies': [
              '../base/base.gyp:base',
-             'curvecp',
-             'net',
+             'net.gyp:curvecp',
+             'net.gyp:net',
              'net_test_support',
              '../testing/gmock.gyp:gmock',
              '../testing/gtest.gyp:gtest',
              '../third_party/zlib/zlib.gyp:zlib',
            ],
            'sources': [
              'curvecp/curvecp_transfer_unittest.cc',
              'curvecp/test_client.cc',
              'curvecp/test_server.cc',
            ],
@@ skipping 20 matching lines @@
             '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',
           ],
         },
       ],
     }],
   ],
 }