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

Side by Side Diff: net/net.gyp

Issue 345063006: Switch to BoringSSL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 6 years, 5 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/http/des.cc ('k') | net/net_nacl.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 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 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 'socket/ssl_server_socket_nss.cc', 248 'socket/ssl_server_socket_nss.cc',
249 'socket/ssl_server_socket_nss.h', 249 'socket/ssl_server_socket_nss.h',
250 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 250 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
251 'third_party/mozilla_security_manager/nsKeygenHandler.h', 251 'third_party/mozilla_security_manager/nsKeygenHandler.h',
252 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 252 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
253 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 253 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
254 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 254 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
255 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 255 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
256 ], 256 ],
257 'dependencies': [ 257 'dependencies': [
258 '../third_party/openssl/openssl.gyp:openssl', 258 '../third_party/boringssl/boringssl.gyp:boringssl',
259 ], 259 ],
260 }, 260 },
261 { # else !use_openssl: remove the unneeded files 261 { # else !use_openssl: remove the unneeded files
262 'sources!': [ 262 'sources!': [
263 'base/crypto_module_openssl.cc', 263 'base/crypto_module_openssl.cc',
264 'cert/ct_log_verifier_openssl.cc', 264 'cert/ct_log_verifier_openssl.cc',
265 'cert/ct_objects_extractor_openssl.cc', 265 'cert/ct_objects_extractor_openssl.cc',
266 'cert/jwk_serializer_openssl.cc', 266 'cert/jwk_serializer_openssl.cc',
267 'cert/x509_util_openssl.cc', 267 'cert/x509_util_openssl.cc',
268 'cert/x509_util_openssl.h', 268 'cert/x509_util_openssl.h',
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
459 }, 459 },
460 }, 460 },
461 ], 461 ],
462 ['OS=="android" and _toolset=="target" and android_webview_build == 0', { 462 ['OS=="android" and _toolset=="target" and android_webview_build == 0', {
463 'dependencies': [ 463 'dependencies': [
464 'net_java', 464 'net_java',
465 ], 465 ],
466 }], 466 }],
467 [ 'OS == "android"', { 467 [ 'OS == "android"', {
468 'dependencies': [ 468 'dependencies': [
469 '../third_party/openssl/openssl.gyp:openssl', 469 '../third_party/boringssl/boringssl.gyp:boringssl',
470 'net_jni_headers', 470 'net_jni_headers',
471 ], 471 ],
472 'sources!': [ 472 'sources!': [
473 'base/openssl_private_key_store_memory.cc', 473 'base/openssl_private_key_store_memory.cc',
474 'cert/cert_database_openssl.cc', 474 'cert/cert_database_openssl.cc',
475 'cert/cert_verify_proc_openssl.cc', 475 'cert/cert_verify_proc_openssl.cc',
476 'cert/test_root_certs_openssl.cc', 476 'cert/test_root_certs_openssl.cc',
477 ], 477 ],
478 # The net/android/keystore_openssl.cc source file needs to
479 # access an OpenSSL-internal header.
480 'include_dirs': [
481 '../third_party/openssl',
482 ],
483 }, 478 },
484 ], 479 ],
485 [ 'use_icu_alternatives_on_android == 1', { 480 [ 'use_icu_alternatives_on_android == 1', {
486 'dependencies!': [ 481 'dependencies!': [
487 '../base/base.gyp:base_i18n', 482 '../base/base.gyp:base_i18n',
488 '../third_party/icu/icu.gyp:icui18n', 483 '../third_party/icu/icu.gyp:icui18n',
489 '../third_party/icu/icu.gyp:icuuc', 484 '../third_party/icu/icu.gyp:icuuc',
490 ], 485 ],
491 'sources!': [ 486 'sources!': [
492 'base/filename_util_icu.cc', 487 'base/filename_util_icu.cc',
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 }], 583 }],
589 [ 'use_nss != 1', { 584 [ 'use_nss != 1', {
590 'sources!': [ 585 'sources!': [
591 'ssl/client_cert_store_nss_unittest.cc', 586 'ssl/client_cert_store_nss_unittest.cc',
592 'ssl/client_cert_store_chromeos_unittest.cc', 587 'ssl/client_cert_store_chromeos_unittest.cc',
593 ], 588 ],
594 }], 589 }],
595 [ 'use_openssl == 1', { 590 [ 'use_openssl == 1', {
596 # Avoid compiling/linking with the system library. 591 # Avoid compiling/linking with the system library.
597 'dependencies': [ 592 'dependencies': [
598 '../third_party/openssl/openssl.gyp:openssl', 593 '../third_party/boringssl/boringssl.gyp:boringssl',
599 ], 594 ],
600 }, { # use_openssl == 0 595 }, { # use_openssl == 0
601 'conditions': [ 596 'conditions': [
602 [ 'desktop_linux == 1 or chromeos == 1', { 597 [ 'desktop_linux == 1 or chromeos == 1', {
603 'dependencies': [ 598 'dependencies': [
604 '../build/linux/system.gyp:ssl', 599 '../build/linux/system.gyp:ssl',
605 ], 600 ],
606 }, { # desktop_linux == 0 and chromeos == 0 601 }, { # desktop_linux == 0 and chromeos == 0
607 'sources!': [ 602 'sources!': [
608 'cert/nss_cert_database_unittest.cc', 603 'cert/nss_cert_database_unittest.cc',
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 # iOS. 786 # iOS.
792 # OS is not "linux" or "freebsd" or "openbsd". 787 # OS is not "linux" or "freebsd" or "openbsd".
793 'socket/unix_domain_socket_posix_unittest.cc', 788 'socket/unix_domain_socket_posix_unittest.cc',
794 789
795 # See bug http://crbug.com/344533. 790 # See bug http://crbug.com/344533.
796 'disk_cache/blockfile/index_table_v3_unittest.cc', 791 'disk_cache/blockfile/index_table_v3_unittest.cc',
797 ], 792 ],
798 }], 793 }],
799 [ 'OS == "android"', { 794 [ 'OS == "android"', {
800 'dependencies': [ 795 'dependencies': [
801 '../third_party/openssl/openssl.gyp:openssl', 796 '../third_party/boringssl/boringssl.gyp:boringssl',
802 ], 797 ],
803 'sources!': [ 798 'sources!': [
804 'dns/dns_config_service_posix_unittest.cc', 799 'dns/dns_config_service_posix_unittest.cc',
805 ], 800 ],
806 }, 801 },
807 ], 802 ],
808 ['OS == "android"', { 803 ['OS == "android"', {
809 # TODO(mmenke): This depends on test_support_base, which depends on 804 # TODO(mmenke): This depends on test_support_base, which depends on
810 # icu. Figure out a way to remove that dependency. 805 # icu. Figure out a way to remove that dependency.
811 'dependencies': [ 806 'dependencies': [
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
972 'conditions': [ 967 'conditions': [
973 ['OS != "ios"', { 968 ['OS != "ios"', {
974 'dependencies': [ 969 'dependencies': [
975 '../third_party/protobuf/protobuf.gyp:py_proto', 970 '../third_party/protobuf/protobuf.gyp:py_proto',
976 ], 971 ],
977 }], 972 }],
978 ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { 973 ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
979 'conditions': [ 974 'conditions': [
980 ['use_openssl==1', { 975 ['use_openssl==1', {
981 'dependencies': [ 976 'dependencies': [
982 '../third_party/openssl/openssl.gyp:openssl', 977 '../third_party/boringssl/boringssl.gyp:boringssl',
983 ], 978 ],
984 }, { 979 }, {
985 'dependencies': [ 980 'dependencies': [
986 '../build/linux/system.gyp:ssl', 981 '../build/linux/system.gyp:ssl',
987 ], 982 ],
988 }], 983 }],
989 ], 984 ],
990 }], 985 }],
991 ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { 986 ['os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
992 'conditions': [ 987 'conditions': [
(...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after
1370 ], 1365 ],
1371 }, 1366 },
1372 { 1367 {
1373 'target_name': 'flip_in_mem_edsm_server_base', 1368 'target_name': 'flip_in_mem_edsm_server_base',
1374 'type': 'static_library', 1369 'type': 'static_library',
1375 'cflags': [ 1370 'cflags': [
1376 '-Wno-deprecated', 1371 '-Wno-deprecated',
1377 ], 1372 ],
1378 'dependencies': [ 1373 'dependencies': [
1379 '../base/base.gyp:base', 1374 '../base/base.gyp:base',
1380 '../third_party/openssl/openssl.gyp:openssl', 1375 '../third_party/boringssl/boringssl.gyp:boringssl',
1381 'balsa', 1376 'balsa',
1382 'epoll_server', 1377 'epoll_server',
1383 'net', 1378 'net',
1384 ], 1379 ],
1385 'sources': [ 1380 'sources': [
1386 'tools/dump_cache/url_to_filename_encoder.cc', 1381 'tools/dump_cache/url_to_filename_encoder.cc',
1387 'tools/dump_cache/url_to_filename_encoder.h', 1382 'tools/dump_cache/url_to_filename_encoder.h',
1388 'tools/dump_cache/url_utilities.h', 1383 'tools/dump_cache/url_utilities.h',
1389 'tools/dump_cache/url_utilities.cc', 1384 'tools/dump_cache/url_utilities.cc',
1390 'tools/flip_server/acceptor_thread.h', 1385 'tools/flip_server/acceptor_thread.h',
(...skipping 24 matching lines...) Expand all
1415 'tools/flip_server/streamer_interface.cc', 1410 'tools/flip_server/streamer_interface.cc',
1416 'tools/flip_server/streamer_interface.h', 1411 'tools/flip_server/streamer_interface.h',
1417 ], 1412 ],
1418 }, 1413 },
1419 { 1414 {
1420 'target_name': 'flip_in_mem_edsm_server_unittests', 1415 'target_name': 'flip_in_mem_edsm_server_unittests',
1421 'type': 'executable', 1416 'type': 'executable',
1422 'dependencies': [ 1417 'dependencies': [
1423 '../testing/gtest.gyp:gtest', 1418 '../testing/gtest.gyp:gtest',
1424 '../testing/gmock.gyp:gmock', 1419 '../testing/gmock.gyp:gmock',
1425 '../third_party/openssl/openssl.gyp:openssl', 1420 '../third_party/boringssl/boringssl.gyp:boringssl',
1426 'flip_in_mem_edsm_server_base', 1421 'flip_in_mem_edsm_server_base',
1427 'net', 1422 'net',
1428 'net_test_support', 1423 'net_test_support',
1429 ], 1424 ],
1430 'sources': [ 1425 'sources': [
1431 'tools/flip_server/flip_test_utils.cc', 1426 'tools/flip_server/flip_test_utils.cc',
1432 'tools/flip_server/flip_test_utils.h', 1427 'tools/flip_server/flip_test_utils.h',
1433 'tools/flip_server/http_interface_test.cc', 1428 'tools/flip_server/http_interface_test.cc',
1434 'tools/flip_server/mem_cache_test.cc', 1429 'tools/flip_server/mem_cache_test.cc',
1435 'tools/flip_server/run_all_tests.cc', 1430 'tools/flip_server/run_all_tests.cc',
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
1704 'net_unittests.isolate', 1699 'net_unittests.isolate',
1705 ], 1700 ],
1706 'sources': [ 1701 'sources': [
1707 'net_unittests.isolate', 1702 'net_unittests.isolate',
1708 ], 1703 ],
1709 }, 1704 },
1710 ], 1705 ],
1711 }], 1706 }],
1712 ], 1707 ],
1713 } 1708 }
OLDNEW
« no previous file with comments | « net/http/des.cc ('k') | net/net_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698