Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Side by Side Diff: net/net.gyp

Issue 7623015: Revert 95907 - Clean up SSL false start blacklist code. Numerous changes, including: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/base/ssl_false_start_blacklist_unittest.cc ('k') | third_party/libevent/libevent.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 'base/ssl_cert_request_info.h', 187 'base/ssl_cert_request_info.h',
188 'base/ssl_cipher_suite_names.cc', 188 'base/ssl_cipher_suite_names.cc',
189 'base/ssl_cipher_suite_names.h', 189 'base/ssl_cipher_suite_names.h',
190 'base/ssl_client_auth_cache.cc', 190 'base/ssl_client_auth_cache.cc',
191 'base/ssl_client_auth_cache.h', 191 'base/ssl_client_auth_cache.h',
192 'base/ssl_config_service.cc', 192 'base/ssl_config_service.cc',
193 'base/ssl_config_service.h', 193 'base/ssl_config_service.h',
194 'base/ssl_config_service_defaults.cc', 194 'base/ssl_config_service_defaults.cc',
195 'base/ssl_config_service_defaults.h', 195 'base/ssl_config_service_defaults.h',
196 'base/ssl_false_start_blacklist.cc', 196 'base/ssl_false_start_blacklist.cc',
197 'base/ssl_false_start_blacklist.h',
198 'base/ssl_info.cc', 197 'base/ssl_info.cc',
199 'base/ssl_info.h', 198 'base/ssl_info.h',
200 'base/static_cookie_policy.cc', 199 'base/static_cookie_policy.cc',
201 'base/static_cookie_policy.h', 200 'base/static_cookie_policy.h',
202 'base/test_data_stream.cc', 201 'base/test_data_stream.cc',
203 'base/test_data_stream.h', 202 'base/test_data_stream.h',
204 'base/test_root_certs.cc', 203 'base/test_root_certs.cc',
205 'base/test_root_certs.h', 204 'base/test_root_certs.h',
206 'base/test_root_certs_mac.cc', 205 'base/test_root_certs_mac.cc',
207 'base/test_root_certs_nss.cc', 206 'base/test_root_certs_nss.cc',
(...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
1329 '../base/base.gyp:base', 1328 '../base/base.gyp:base',
1330 ], 1329 ],
1331 'sources': [ 1330 'sources': [
1332 'tools/dnssec_chain_verify/dnssec_chain_verify.cc', 1331 'tools/dnssec_chain_verify/dnssec_chain_verify.cc',
1333 ] 1332 ]
1334 }, 1333 },
1335 { 1334 {
1336 'target_name': 'ssl_false_start_blacklist_process', 1335 'target_name': 'ssl_false_start_blacklist_process',
1337 'type': 'executable', 1336 'type': 'executable',
1338 'toolsets': ['host'], 1337 'toolsets': ['host'],
1339 'dependencies': [
1340 '../base/base.gyp:base',
1341 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
1342 ],
1343 'include_dirs': [ 1338 'include_dirs': [
1344 '..', 1339 '..',
1345 ], 1340 ],
1346 'sources': [ 1341 'sources': [
1347 'base/ssl_false_start_blacklist_process.cc', 1342 'base/ssl_false_start_blacklist_process.cc',
1348 'base/ssl_false_start_blacklist.h',
1349 ], 1343 ],
1350 }, 1344 },
1351 ], 1345 ],
1352 'conditions': [ 1346 'conditions': [
1353 ['os_posix == 1 and OS != "mac"', { 1347 ['os_posix == 1 and OS != "mac"', {
1354 'targets': [ 1348 'targets': [
1355 { 1349 {
1356 'target_name': 'flip_in_mem_edsm_server', 1350 'target_name': 'flip_in_mem_edsm_server',
1357 'type': 'executable', 1351 'type': 'executable',
1358 'cflags': [ 1352 'cflags': [
1359 '-Wno-deprecated', 1353 '-Wno-deprecated',
1360 ], 1354 ],
1361 'dependencies': [ 1355 'dependencies': [
1362 '../base/base.gyp:base', 1356 '../base/base.gyp:base',
1363 'net', 1357 'net.gyp:net',
1364 '../third_party/openssl/openssl.gyp:openssl', 1358 '../third_party/openssl/openssl.gyp:openssl',
1365 ], 1359 ],
1366 'sources': [ 1360 'sources': [
1367 'tools/dump_cache/url_to_filename_encoder.cc', 1361 'tools/dump_cache/url_to_filename_encoder.cc',
1368 'tools/dump_cache/url_to_filename_encoder.h', 1362 'tools/dump_cache/url_to_filename_encoder.h',
1369 'tools/dump_cache/url_utilities.h', 1363 'tools/dump_cache/url_utilities.h',
1370 'tools/dump_cache/url_utilities.cc', 1364 'tools/dump_cache/url_utilities.cc',
1371 1365
1372 'tools/flip_server/acceptor_thread.h', 1366 'tools/flip_server/acceptor_thread.h',
1373 'tools/flip_server/acceptor_thread.cc', 1367 'tools/flip_server/acceptor_thread.cc',
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
1415 'tools/flip_server/streamer_interface.cc', 1409 'tools/flip_server/streamer_interface.cc',
1416 'tools/flip_server/streamer_interface.h', 1410 'tools/flip_server/streamer_interface.h',
1417 'tools/flip_server/string_piece_utils.h', 1411 'tools/flip_server/string_piece_utils.h',
1418 ], 1412 ],
1419 }, 1413 },
1420 { 1414 {
1421 'target_name': 'curvecp', 1415 'target_name': 'curvecp',
1422 'type': 'static_library', 1416 'type': 'static_library',
1423 'dependencies': [ 1417 'dependencies': [
1424 '../base/base.gyp:base', 1418 '../base/base.gyp:base',
1425 'net', 1419 'net.gyp:net',
1426 ], 1420 ],
1427 'sources': [ 1421 'sources': [
1428 'curvecp/circular_buffer.cc', 1422 'curvecp/circular_buffer.cc',
1429 'curvecp/circular_buffer.h', 1423 'curvecp/circular_buffer.h',
1430 'curvecp/client_packetizer.cc', 1424 'curvecp/client_packetizer.cc',
1431 'curvecp/client_packetizer.h', 1425 'curvecp/client_packetizer.h',
1432 'curvecp/connection_key.cc', 1426 'curvecp/connection_key.cc',
1433 'curvecp/connection_key.h', 1427 'curvecp/connection_key.h',
1434 'curvecp/curvecp_client_socket.cc', 1428 'curvecp/curvecp_client_socket.cc',
1435 'curvecp/curvecp_client_socket.h', 1429 'curvecp/curvecp_client_socket.h',
(...skipping 14 matching lines...) Expand all
1450 'curvecp/server_messenger.h', 1444 'curvecp/server_messenger.h',
1451 'curvecp/server_packetizer.cc', 1445 'curvecp/server_packetizer.cc',
1452 'curvecp/server_packetizer.h', 1446 'curvecp/server_packetizer.h',
1453 ], 1447 ],
1454 }, 1448 },
1455 { 1449 {
1456 'target_name': 'curvecp_unittests', 1450 'target_name': 'curvecp_unittests',
1457 'type': 'executable', 1451 'type': 'executable',
1458 'dependencies': [ 1452 'dependencies': [
1459 '../base/base.gyp:base', 1453 '../base/base.gyp:base',
1460 'curvecp', 1454 'net.gyp:curvecp',
1461 'net', 1455 'net.gyp:net',
1462 'net_test_support', 1456 'net_test_support',
1463 '../testing/gmock.gyp:gmock', 1457 '../testing/gmock.gyp:gmock',
1464 '../testing/gtest.gyp:gtest', 1458 '../testing/gtest.gyp:gtest',
1465 '../third_party/zlib/zlib.gyp:zlib', 1459 '../third_party/zlib/zlib.gyp:zlib',
1466 ], 1460 ],
1467 'sources': [ 1461 'sources': [
1468 'curvecp/curvecp_transfer_unittest.cc', 1462 'curvecp/curvecp_transfer_unittest.cc',
1469 'curvecp/test_client.cc', 1463 'curvecp/test_client.cc',
1470 'curvecp/test_server.cc', 1464 'curvecp/test_server.cc',
1471 ], 1465 ],
(...skipping 20 matching lines...) Expand all
1492 'tools/dump_cache/url_to_filename_encoder.cc', 1486 'tools/dump_cache/url_to_filename_encoder.cc',
1493 'tools/dump_cache/url_to_filename_encoder.h', 1487 'tools/dump_cache/url_to_filename_encoder.h',
1494 'tools/dump_cache/url_utilities.h', 1488 'tools/dump_cache/url_utilities.h',
1495 'tools/dump_cache/url_utilities.cc', 1489 'tools/dump_cache/url_utilities.cc',
1496 ], 1490 ],
1497 }, 1491 },
1498 ], 1492 ],
1499 }], 1493 }],
1500 ], 1494 ],
1501 } 1495 }
OLDNEW
« no previous file with comments | « net/base/ssl_false_start_blacklist_unittest.cc ('k') | third_party/libevent/libevent.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698