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

Side by Side Diff: net/net.gyp

Issue 206453002: Introduce USE_OPENSSL_CERTS for certificate handling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'use_tracing_cache_backend%': 0, 10 'use_tracing_cache_backend%': 0,
(...skipping 1397 matching lines...) Expand 10 before | Expand all | Expand 10 after
1408 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 1408 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
1409 ], 1409 ],
1410 }, 1410 },
1411 { # else !use_openssl: remove the unneeded files 1411 { # else !use_openssl: remove the unneeded files
1412 'sources!': [ 1412 'sources!': [
1413 'base/crypto_module_openssl.cc', 1413 'base/crypto_module_openssl.cc',
1414 'base/keygen_handler_openssl.cc', 1414 'base/keygen_handler_openssl.cc',
1415 'base/openssl_private_key_store.h', 1415 'base/openssl_private_key_store.h',
1416 'base/openssl_private_key_store_android.cc', 1416 'base/openssl_private_key_store_android.cc',
1417 'base/openssl_private_key_store_memory.cc', 1417 'base/openssl_private_key_store_memory.cc',
1418 'cert/cert_database_openssl.cc',
1419 'cert/cert_verify_proc_openssl.cc',
1420 'cert/cert_verify_proc_openssl.h',
1421 'cert/ct_log_verifier_openssl.cc', 1418 'cert/ct_log_verifier_openssl.cc',
1422 'cert/ct_objects_extractor_openssl.cc', 1419 'cert/ct_objects_extractor_openssl.cc',
1423 'cert/jwk_serializer_openssl.cc', 1420 'cert/jwk_serializer_openssl.cc',
1424 'cert/test_root_certs_openssl.cc',
1425 'cert/x509_certificate_openssl.cc',
1426 'cert/x509_util_openssl.cc', 1421 'cert/x509_util_openssl.cc',
1427 'cert/x509_util_openssl.h', 1422 'cert/x509_util_openssl.h',
1428 'quic/crypto/aead_base_decrypter_openssl.cc', 1423 'quic/crypto/aead_base_decrypter_openssl.cc',
1429 'quic/crypto/aead_base_encrypter_openssl.cc', 1424 'quic/crypto/aead_base_encrypter_openssl.cc',
1430 'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc', 1425 'quic/crypto/aes_128_gcm_12_decrypter_openssl.cc',
1431 'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc', 1426 'quic/crypto/aes_128_gcm_12_encrypter_openssl.cc',
1432 'quic/crypto/chacha20_poly1305_decrypter_openssl.cc', 1427 'quic/crypto/chacha20_poly1305_decrypter_openssl.cc',
1433 'quic/crypto/chacha20_poly1305_encrypter_openssl.cc', 1428 'quic/crypto/chacha20_poly1305_encrypter_openssl.cc',
1434 'quic/crypto/channel_id_openssl.cc', 1429 'quic/crypto/channel_id_openssl.cc',
1435 'quic/crypto/p256_key_exchange_openssl.cc', 1430 'quic/crypto/p256_key_exchange_openssl.cc',
1436 'quic/crypto/scoped_evp_aead_ctx.cc', 1431 'quic/crypto/scoped_evp_aead_ctx.cc',
1437 'quic/crypto/scoped_evp_aead_ctx.h', 1432 'quic/crypto/scoped_evp_aead_ctx.h',
1438 'socket/ssl_client_socket_openssl.cc', 1433 'socket/ssl_client_socket_openssl.cc',
1439 'socket/ssl_client_socket_openssl.h', 1434 'socket/ssl_client_socket_openssl.h',
1440 'socket/ssl_server_socket_openssl.cc', 1435 'socket/ssl_server_socket_openssl.cc',
1441 'socket/ssl_session_cache_openssl.cc', 1436 'socket/ssl_session_cache_openssl.cc',
1442 'socket/ssl_session_cache_openssl.h', 1437 'socket/ssl_session_cache_openssl.h',
1438 ],
1439 },
1440 ],
1441 [ 'use_openssl_certs == 0 and OS != "android"', {
1442 'sources!': [
1443 'cert/cert_database_openssl.cc',
1444 'cert/cert_verify_proc_openssl.cc',
1445 'cert/cert_verify_proc_openssl.h',
1446 'cert/test_root_certs_openssl.cc',
1447 'cert/x509_certificate_openssl.cc',
1443 'ssl/openssl_client_key_store.cc', 1448 'ssl/openssl_client_key_store.cc',
1444 'ssl/openssl_client_key_store.h', 1449 'ssl/openssl_client_key_store.h',
1445 ], 1450 ],
1446 }, 1451 }],
1447 ],
1448 [ 'use_glib == 1', { 1452 [ 'use_glib == 1', {
1449 'dependencies': [ 1453 'dependencies': [
1450 '../build/linux/system.gyp:gconf', 1454 '../build/linux/system.gyp:gconf',
1451 '../build/linux/system.gyp:gio', 1455 '../build/linux/system.gyp:gio',
1452 ], 1456 ],
1453 }], 1457 }],
1458 [ 'use_openssl == 1', {
1459 'dependencies': [
1460 '../third_party/openssl/openssl.gyp:openssl',
1461 ],
1462 }],
1454 [ 'desktop_linux == 1 or chromeos == 1', { 1463 [ 'desktop_linux == 1 or chromeos == 1', {
1455 'conditions': [ 1464 'conditions': [
1456 ['use_openssl==1', { 1465 ['use_openssl == 0', {
1457 'dependencies': [ 1466 # use NSS
1458 '../third_party/openssl/openssl.gyp:openssl',
1459 ],
1460 },
1461 { # else use_openssl==0, use NSS
1462 'dependencies': [ 1467 'dependencies': [
1463 '../build/linux/system.gyp:ssl', 1468 '../build/linux/system.gyp:ssl',
1464 ], 1469 ],
1465 }], 1470 }],
1466 ['os_bsd==1', { 1471 ['os_bsd==1', {
1467 'sources!': [ 1472 'sources!': [
1468 'base/network_change_notifier_linux.cc', 1473 'base/network_change_notifier_linux.cc',
1469 'base/network_change_notifier_netlink_linux.cc', 1474 'base/network_change_notifier_netlink_linux.cc',
1470 'proxy/proxy_config_service_linux.cc', 1475 'proxy/proxy_config_service_linux.cc',
1471 ], 1476 ],
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
1560 'base/winsock_init.cc', 1565 'base/winsock_init.cc',
1561 'base/winsock_init.h', 1566 'base/winsock_init.h',
1562 'base/winsock_util.cc', 1567 'base/winsock_util.cc',
1563 'base/winsock_util.h', 1568 'base/winsock_util.h',
1564 'proxy/proxy_resolver_winhttp.cc', 1569 'proxy/proxy_resolver_winhttp.cc',
1565 'proxy/proxy_resolver_winhttp.h', 1570 'proxy/proxy_resolver_winhttp.h',
1566 ], 1571 ],
1567 }, 1572 },
1568 ], 1573 ],
1569 [ 'OS == "mac"', { 1574 [ 'OS == "mac"', {
1570 'dependencies': [ 1575 'conditions': [
1571 '../third_party/nss/nss.gyp:nspr', 1576 [ 'use_openssl == 0', {
1572 '../third_party/nss/nss.gyp:nss', 1577 'dependencies': [
1573 'third_party/nss/ssl.gyp:libssl', 1578 # defaults to nss
1579 '../third_party/nss/nss.gyp:nspr',
1580 '../third_party/nss/nss.gyp:nss',
1581 'third_party/nss/ssl.gyp:libssl',
1582 ],
1583 }],
1574 ], 1584 ],
1575 'link_settings': { 1585 'link_settings': {
1576 'libraries': [ 1586 'libraries': [
1577 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', 1587 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
1578 '$(SDKROOT)/System/Library/Frameworks/Security.framework', 1588 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
1579 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork', 1589 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framew ork',
1580 '$(SDKROOT)/usr/lib/libresolv.dylib', 1590 '$(SDKROOT)/usr/lib/libresolv.dylib',
1581 ] 1591 ]
1582 }, 1592 },
1583 }, 1593 },
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
2252 'cert/nss_cert_database_unittest.cc', 2262 'cert/nss_cert_database_unittest.cc',
2253 'cert/x509_util_nss_unittest.cc', 2263 'cert/x509_util_nss_unittest.cc',
2254 'quic/test_tools/crypto_test_utils_nss.cc', 2264 'quic/test_tools/crypto_test_utils_nss.cc',
2255 ], 2265 ],
2256 }, { # else !use_openssl: remove the unneeded files 2266 }, { # else !use_openssl: remove the unneeded files
2257 'sources!': [ 2267 'sources!': [
2258 'cert/x509_util_openssl_unittest.cc', 2268 'cert/x509_util_openssl_unittest.cc',
2259 'quic/test_tools/crypto_test_utils_openssl.cc', 2269 'quic/test_tools/crypto_test_utils_openssl.cc',
2260 'socket/ssl_client_socket_openssl_unittest.cc', 2270 'socket/ssl_client_socket_openssl_unittest.cc',
2261 'socket/ssl_session_cache_openssl_unittest.cc', 2271 'socket/ssl_session_cache_openssl_unittest.cc',
2262 'ssl/openssl_client_key_store_unittest.cc',
2263 ], 2272 ],
2264 }, 2273 },
2265 ], 2274 ],
2275 [ 'use_openssl_certs == 0', {
2276 'sources!': [
2277 'ssl/openssl_client_key_store_unittest.cc',
2278 ],
2279 }],
2266 [ 'enable_websockets != 1', { 2280 [ 'enable_websockets != 1', {
2267 'sources/': [ 2281 'sources/': [
2268 ['exclude', '^socket_stream/'], 2282 ['exclude', '^socket_stream/'],
2269 ['exclude', '^websockets/'], 2283 ['exclude', '^websockets/'],
2270 ['exclude', '^spdy/spdy_websocket_stream_unittest\\.cc$'], 2284 ['exclude', '^spdy/spdy_websocket_stream_unittest\\.cc$'],
2271 ], 2285 ],
2272 }], 2286 }],
2273 [ 'disable_ftp_support==1', { 2287 [ 'disable_ftp_support==1', {
2274 'sources/': [ 2288 'sources/': [
2275 ['exclude', '^ftp/'], 2289 ['exclude', '^ftp/'],
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
2323 # TODO(mark): Specifying this here shouldn't be necessary. 2337 # TODO(mark): Specifying this here shouldn't be necessary.
2324 'dependencies': [ 2338 'dependencies': [
2325 '../third_party/icu/icu.gyp:icudata', 2339 '../third_party/icu/icu.gyp:icudata',
2326 ], 2340 ],
2327 }], 2341 }],
2328 ], 2342 ],
2329 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 2343 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
2330 'msvs_disabled_warnings': [4267, ], 2344 'msvs_disabled_warnings': [4267, ],
2331 }, 2345 },
2332 ], 2346 ],
2333 [ 'OS == "mac"', { 2347 [ 'OS == "mac" and use_openssl == 0', {
2334 'dependencies': [ 2348 'dependencies': [
2335 '../third_party/nss/nss.gyp:nspr', 2349 '../third_party/nss/nss.gyp:nspr',
2336 '../third_party/nss/nss.gyp:nss', 2350 '../third_party/nss/nss.gyp:nss',
2337 'third_party/nss/ssl.gyp:libssl', 2351 'third_party/nss/ssl.gyp:libssl',
2338 ], 2352 ],
2339 }, 2353 },
2340 ], 2354 ],
2341 [ 'OS == "ios"', { 2355 [ 'OS == "ios"', {
2342 'dependencies': [ 2356 'dependencies': [
2343 '../third_party/nss/nss.gyp:nss', 2357 '../third_party/nss/nss.gyp:nss',
(...skipping 1061 matching lines...) Expand 10 before | Expand all | Expand 10 after
3405 'java_in_dir': 'cronet/android/sample/javatests', 3419 'java_in_dir': 'cronet/android/sample/javatests',
3406 'resource_dir': 'cronet/android/sample/res', 3420 'resource_dir': 'cronet/android/sample/res',
3407 'is_test_apk': 1, 3421 'is_test_apk': 1,
3408 }, 3422 },
3409 'includes': [ '../build/java_apk.gypi' ], 3423 'includes': [ '../build/java_apk.gypi' ],
3410 }, 3424 },
3411 ], 3425 ],
3412 }], # OS=="android" 3426 }], # OS=="android"
3413 ], 3427 ],
3414 } 3428 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698