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

Side by Side Diff: net/net.gyp

Issue 3565006: Decouples certificates viewers from NSS to prepare support for OpenSSL. (Closed)
Patch Set: Comments / ProcessIDN Created 10 years, 2 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
« no previous file with comments | « net/base/cert_type.h ('k') | no next file » | 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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 648 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 }], 659 }],
660 ['chromeos==1', { 660 ['chromeos==1', {
661 'sources!': [ 661 'sources!': [
662 'proxy/proxy_config_service_linux.cc', 662 'proxy/proxy_config_service_linux.cc',
663 'proxy/proxy_config_service_linux.h', 663 'proxy/proxy_config_service_linux.h',
664 ], 664 ],
665 }], 665 }],
666 ['use_openssl==1 and OS == "linux"', { 666 ['use_openssl==1 and OS == "linux"', {
667 'dependencies': [ 667 'dependencies': [
668 '../build/linux/system.gyp:openssl', 668 '../build/linux/system.gyp:openssl',
669 ] 669 ],
670 'sources!': [
671 'socket/ssl_client_socket_nss.cc',
672 'socket/ssl_client_socket_nss.h',
673 'socket/ssl_client_socket_nss_factory.cc',
674 'socket/ssl_client_socket_nss_factory.h',
675 ],
670 }, 676 },
671 { # else !use_openssl: remove the unneeded files 677 { # else !use_openssl: remove the unneeded files
672 'sources!': [ 678 'sources!': [
673 'socket/ssl_client_socket_openssl.cc', 679 'socket/ssl_client_socket_openssl.cc',
674 'socket/ssl_client_socket_openssl.h', 680 'socket/ssl_client_socket_openssl.h',
675 ], 681 ],
676 }, 682 },
677 ], 683 ],
678 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 684 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
679 'dependencies': [ 685 'dependencies': [
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 'sources!': [ 916 'sources!': [
911 'base/sdch_filter_unittest.cc', 917 'base/sdch_filter_unittest.cc',
912 ], 918 ],
913 }, 919 },
914 { # else: OS is not in the above list 920 { # else: OS is not in the above list
915 'sources!': [ 921 'sources!': [
916 'base/cert_database_nss_unittest.cc', 922 'base/cert_database_nss_unittest.cc',
917 ], 923 ],
918 } 924 }
919 ], 925 ],
920 ['OS == "linux"', { 926 [ 'OS == "linux"', {
921 'conditions': [ 927 'conditions': [
922 ['linux_use_tcmalloc==1', { 928 ['linux_use_tcmalloc==1', {
923 'dependencies': [ 929 'dependencies': [
924 '../base/allocator/allocator.gyp:allocator', 930 '../base/allocator/allocator.gyp:allocator',
925 ], 931 ],
926 }], 932 }],
927 ], 933 ],
928 }], 934 }],
935 [ 'use_openssl == 1 and OS == "linux"', {
936 # When building for OpenSSL, we need to exclude some NSS files.
937 # TODO(bulach): remove once we fully support OpenSSL.
938 'sources!': [
939 'base/cert_database_nss_unittest.cc',
940 ],
941 },
942 ],
929 [ 'OS == "win"', { 943 [ 'OS == "win"', {
930 'sources!': [ 944 'sources!': [
931 'http/http_auth_gssapi_posix_unittest.cc', 945 'http/http_auth_gssapi_posix_unittest.cc',
932 ], 946 ],
933 # This is needed to trigger the dll copy step on windows. 947 # This is needed to trigger the dll copy step on windows.
934 # TODO(mark): Specifying this here shouldn't be necessary. 948 # TODO(mark): Specifying this here shouldn't be necessary.
935 'dependencies': [ 949 'dependencies': [
936 '../third_party/icu/icu.gyp:icudata', 950 '../third_party/icu/icu.gyp:icudata',
937 ], 951 ],
938 }, 952 },
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
1058 }], 1072 }],
1059 ['OS == "linux"', { 1073 ['OS == "linux"', {
1060 'conditions': [ 1074 'conditions': [
1061 ['linux_use_tcmalloc==1', { 1075 ['linux_use_tcmalloc==1', {
1062 'dependencies': [ 1076 'dependencies': [
1063 '../base/allocator/allocator.gyp:allocator', 1077 '../base/allocator/allocator.gyp:allocator',
1064 ], 1078 ],
1065 }], 1079 }],
1066 ], 1080 ],
1067 }], 1081 }],
1082 ['use_openssl==1 and OS == "linux"', {
1083 'dependencies': [
1084 '../build/linux/system.gyp:openssl',
1085 ]
1086 }],
1068 ], 1087 ],
1069 }, 1088 },
1070 { 1089 {
1071 'target_name': 'net_resources', 1090 'target_name': 'net_resources',
1072 'type': 'none', 1091 'type': 'none',
1073 'msvs_guid': '8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942', 1092 'msvs_guid': '8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942',
1074 'variables': { 1093 'variables': {
1075 'grit_cmd': ['python', '../tools/grit/grit.py'], 1094 'grit_cmd': ['python', '../tools/grit/grit.py'],
1076 'grit_info_cmd': ['python', '../tools/grit/grit_info.py'], 1095 'grit_info_cmd': ['python', '../tools/grit/grit_info.py'],
1077 'input_paths': [ 1096 'input_paths': [
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
1273 ], 1292 ],
1274 }], 1293 }],
1275 ], 1294 ],
1276 } 1295 }
1277 1296
1278 # Local Variables: 1297 # Local Variables:
1279 # tab-width:2 1298 # tab-width:2
1280 # indent-tabs-mode:nil 1299 # indent-tabs-mode:nil
1281 # End: 1300 # End:
1282 # vim: set expandtab tabstop=2 shiftwidth=2: 1301 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « net/base/cert_type.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698