OLD | NEW |
---|---|
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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
170 'base/ssl_config_service_defaults.h', | 170 'base/ssl_config_service_defaults.h', |
171 'base/ssl_config_service_mac.cc', | 171 'base/ssl_config_service_mac.cc', |
172 'base/ssl_config_service_mac.h', | 172 'base/ssl_config_service_mac.h', |
173 'base/ssl_config_service_win.cc', | 173 'base/ssl_config_service_win.cc', |
174 'base/ssl_config_service_win.h', | 174 'base/ssl_config_service_win.h', |
175 'base/ssl_false_start_blacklist.cc', | 175 'base/ssl_false_start_blacklist.cc', |
176 'base/ssl_info.cc', | 176 'base/ssl_info.cc', |
177 'base/ssl_info.h', | 177 'base/ssl_info.h', |
178 'base/static_cookie_policy.cc', | 178 'base/static_cookie_policy.cc', |
179 'base/static_cookie_policy.h', | 179 'base/static_cookie_policy.h', |
180 'base/temporary_root_certs.cc', | |
181 'base/temporary_root_certs.h', | |
182 'base/temporary_root_certs_mac.cc', | |
183 'base/temporary_root_certs_nss.cc', | |
184 'base/temporary_root_certs_openssl.cc', | |
185 'base/temporary_root_certs_win.cc', | |
180 'base/transport_security_state.cc', | 186 'base/transport_security_state.cc', |
181 'base/transport_security_state.h', | 187 'base/transport_security_state.h', |
182 'base/sys_addrinfo.h', | 188 'base/sys_addrinfo.h', |
183 'base/test_completion_callback.h', | 189 'base/test_completion_callback.h', |
184 'base/upload_data.cc', | 190 'base/upload_data.cc', |
185 'base/upload_data.h', | 191 'base/upload_data.h', |
186 'base/upload_data_stream.cc', | 192 'base/upload_data_stream.cc', |
187 'base/upload_data_stream.h', | 193 'base/upload_data_stream.h', |
188 'base/winsock_init.cc', | 194 'base/winsock_init.cc', |
189 'base/winsock_init.h', | 195 'base/winsock_init.h', |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
245 'dependencies': [ | 251 'dependencies': [ |
246 '../build/linux/system.gyp:nss', | 252 '../build/linux/system.gyp:nss', |
247 ], | 253 ], |
248 }], | 254 }], |
249 ], | 255 ], |
250 }, | 256 }, |
251 { # else: OS is not in the above list | 257 { # else: OS is not in the above list |
252 'sources!': [ | 258 'sources!': [ |
253 'base/cert_database_nss.cc', | 259 'base/cert_database_nss.cc', |
254 'base/keygen_handler_nss.cc', | 260 'base/keygen_handler_nss.cc', |
261 'base/temporary_root_certs_nss.cc', | |
255 'base/x509_certificate_nss.cc', | 262 'base/x509_certificate_nss.cc', |
256 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', | 263 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', |
257 'third_party/mozilla_security_manager/nsKeygenHandler.h', | 264 'third_party/mozilla_security_manager/nsKeygenHandler.h', |
258 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', | 265 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', |
259 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', | 266 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', |
260 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp', | 267 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp', |
261 'third_party/mozilla_security_manager/nsNSSCertTrust.h', | 268 'third_party/mozilla_security_manager/nsNSSCertTrust.h', |
262 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', | 269 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', |
263 'third_party/mozilla_security_manager/nsPKCS12Blob.h', | 270 'third_party/mozilla_security_manager/nsPKCS12Blob.h', |
264 ], | 271 ], |
265 }, | 272 }, |
266 ], | 273 ], |
267 [ 'use_openssl==1', { | 274 [ 'use_openssl==1', { |
268 'sources!': [ | 275 'sources!': [ |
269 'base/cert_database_nss.cc', | 276 'base/cert_database_nss.cc', |
270 'base/dnssec_keyset.cc', | 277 'base/dnssec_keyset.cc', |
271 'base/dnssec_keyset.h', | 278 'base/dnssec_keyset.h', |
272 'base/keygen_handler_nss.cc', | 279 'base/keygen_handler_nss.cc', |
273 'base/nss_memio.c', | 280 'base/nss_memio.c', |
274 'base/nss_memio.h', | 281 'base/nss_memio.h', |
282 'base/temporary_root_certs_nss.cc', | |
275 'base/x509_certificate_nss.cc', | 283 'base/x509_certificate_nss.cc', |
276 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', | 284 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', |
277 'third_party/mozilla_security_manager/nsKeygenHandler.h', | 285 'third_party/mozilla_security_manager/nsKeygenHandler.h', |
278 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', | 286 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', |
279 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', | 287 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', |
280 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp', | 288 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp', |
281 'third_party/mozilla_security_manager/nsNSSCertTrust.h', | 289 'third_party/mozilla_security_manager/nsNSSCertTrust.h', |
282 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', | 290 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', |
283 'third_party/mozilla_security_manager/nsPKCS12Blob.h', | 291 'third_party/mozilla_security_manager/nsPKCS12Blob.h', |
284 ], | 292 ], |
285 }, | 293 }, |
286 { # else: not using openssl. | 294 { # else: not using openssl. |
287 'sources!': [ | 295 'sources!': [ |
288 'base/cert_database_openssl.cc', | 296 'base/cert_database_openssl.cc', |
289 'base/keygen_handler_openssl.cc', | 297 'base/keygen_handler_openssl.cc', |
290 'base/openssl_util.cc', | 298 'base/openssl_util.cc', |
291 'base/openssl_util.h', | 299 'base/openssl_util.h', |
300 'base/temporary_root_certs_openssl.cc', | |
292 'base/x509_certificate_openssl.cc', | 301 'base/x509_certificate_openssl.cc', |
293 'base/x509_openssl_util.cc', | 302 'base/x509_openssl_util.cc', |
294 'base/x509_openssl_util.h', | 303 'base/x509_openssl_util.h', |
295 ], | 304 ], |
296 }, | 305 }, |
297 ], | 306 ], |
298 [ 'OS == "win"', { | 307 [ 'OS == "win"', { |
299 'dependencies': [ | 308 'dependencies': [ |
300 '../third_party/nss/nss.gyp:nss', | 309 '../third_party/nss/nss.gyp:nss', |
301 'tld_cleanup', | 310 'tld_cleanup', |
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
715 ], | 724 ], |
716 }], | 725 }], |
717 ['chromeos==1', { | 726 ['chromeos==1', { |
718 'sources!': [ | 727 'sources!': [ |
719 'proxy/proxy_config_service_linux.cc', | 728 'proxy/proxy_config_service_linux.cc', |
720 'proxy/proxy_config_service_linux.h', | 729 'proxy/proxy_config_service_linux.h', |
721 ], | 730 ], |
722 }], | 731 }], |
723 ['use_openssl==1', { | 732 ['use_openssl==1', { |
724 'sources!': [ | 733 'sources!': [ |
734 'ocsp/nss_ocsp.cc', | |
wtc
2010/11/16 23:24:01
Is this a merge error? This change doesn't belong
Ryan Sleevi
2010/11/17 09:37:43
See message #1. It was a necessary change to get t
| |
735 'ocsp/nss_ocsp.h', | |
725 'socket/dns_cert_provenance_check.cc', | 736 'socket/dns_cert_provenance_check.cc', |
726 'socket/dns_cert_provenance_check.h', | 737 'socket/dns_cert_provenance_check.h', |
727 'socket/ssl_client_socket_nss.cc', | 738 'socket/ssl_client_socket_nss.cc', |
728 'socket/ssl_client_socket_nss.h', | 739 'socket/ssl_client_socket_nss.h', |
729 'socket/ssl_client_socket_nss_factory.cc', | 740 'socket/ssl_client_socket_nss_factory.cc', |
730 'socket/ssl_client_socket_nss_factory.h', | 741 'socket/ssl_client_socket_nss_factory.h', |
731 ], | 742 ], |
732 }, | 743 }, |
733 { # else !use_openssl: remove the unneeded files | 744 { # else !use_openssl: remove the unneeded files |
734 'sources!': [ | 745 'sources!': [ |
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1146 { | 1157 { |
1147 'target_name': 'net_test_support', | 1158 'target_name': 'net_test_support', |
1148 'type': '<(library)', | 1159 'type': '<(library)', |
1149 'dependencies': [ | 1160 'dependencies': [ |
1150 'net', | 1161 'net', |
1151 '../base/base.gyp:base', | 1162 '../base/base.gyp:base', |
1152 '../base/base.gyp:test_support_base', | 1163 '../base/base.gyp:test_support_base', |
1153 '../testing/gtest.gyp:gtest', | 1164 '../testing/gtest.gyp:gtest', |
1154 ], | 1165 ], |
1155 'sources': [ | 1166 'sources': [ |
1156 'base/cert_test_util.cc', | |
1157 'base/cert_test_util.h', | |
1158 'disk_cache/disk_cache_test_util.cc', | 1167 'disk_cache/disk_cache_test_util.cc', |
1159 'disk_cache/disk_cache_test_util.h', | 1168 'disk_cache/disk_cache_test_util.h', |
1160 'proxy/proxy_config_service_common_unittest.cc', | 1169 'proxy/proxy_config_service_common_unittest.cc', |
1161 'proxy/proxy_config_service_common_unittest.h', | 1170 'proxy/proxy_config_service_common_unittest.h', |
1162 'socket/socket_test_util.cc', | 1171 'socket/socket_test_util.cc', |
1163 'socket/socket_test_util.h', | 1172 'socket/socket_test_util.h', |
1164 'test/python_utils.cc', | 1173 'test/python_utils.cc', |
1165 'test/python_utils.h', | 1174 'test/python_utils.h', |
1166 'test/test_server.cc', | 1175 'test/test_server.cc', |
1167 'test/test_server_posix.cc', | 1176 'test/test_server_posix.cc', |
1168 'test/test_server_win.cc', | 1177 'test/test_server_win.cc', |
1169 'test/test_server.h', | 1178 'test/test_server.h', |
1170 ], | 1179 ], |
1171 'conditions': [ | 1180 'conditions': [ |
1172 ['inside_chromium_build==1', { | 1181 ['inside_chromium_build==1', { |
1173 'dependencies': [ | 1182 'dependencies': [ |
1174 '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto', | 1183 '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto', |
1175 '../third_party/protobuf/protobuf.gyp:py_proto', | 1184 '../third_party/protobuf/protobuf.gyp:py_proto', |
1176 ], | 1185 ], |
1177 }], | 1186 }], |
1178 ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', { | 1187 ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', { |
1179 'conditions': [ | 1188 'conditions': [ |
1180 ['use_openssl==1', { | 1189 ['use_openssl==1', { |
1181 'dependencies': [ | 1190 'dependencies': [ |
1182 '../build/linux/system.gyp:openssl', | 1191 '../build/linux/system.gyp:openssl', |
1183 ] | 1192 ], |
1184 }, { | 1193 }, { |
1185 'dependencies': [ | 1194 'dependencies': [ |
1186 '../build/linux/system.gyp:nss', | 1195 '../build/linux/system.gyp:nss', |
1187 ], | 1196 ], |
1188 }], | 1197 }], |
1189 ], | 1198 ], |
1190 }], | 1199 }], |
1191 ['OS == "linux"', { | 1200 ['OS == "linux"', { |
1192 'conditions': [ | 1201 'conditions': [ |
1193 ['linux_use_tcmalloc==1', { | 1202 ['linux_use_tcmalloc==1', { |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1406 ], | 1415 ], |
1407 }], | 1416 }], |
1408 ], | 1417 ], |
1409 } | 1418 } |
1410 | 1419 |
1411 # Local Variables: | 1420 # Local Variables: |
1412 # tab-width:2 | 1421 # tab-width:2 |
1413 # indent-tabs-mode:nil | 1422 # indent-tabs-mode:nil |
1414 # End: | 1423 # End: |
1415 # vim: set expandtab tabstop=2 shiftwidth=2: | 1424 # vim: set expandtab tabstop=2 shiftwidth=2: |
OLD | NEW |