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

Side by Side Diff: net/BUILD.gn

Issue 1070893002: Move net/ocsp/* into net/cert_net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cert_fetcher
Patch Set: undo header re-ordering -- seems to be breaking compile Created 5 years, 8 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 | « chromecast/browser/url_request_context_factory.cc ('k') | net/cert_net/nss_ocsp.h » ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 import("//build/config/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//build/module_args/v8.gni") 8 import("//build/module_args/v8.gni")
9 import("//url/config.gni") 9 import("//url/config.gni")
10 import("//testing/test.gni") 10 import("//testing/test.gni")
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 sources -= [ 190 sources -= [
191 "base/nss_memio.c", 191 "base/nss_memio.c",
192 "base/nss_memio.h", 192 "base/nss_memio.h",
193 "cert/ct_log_verifier_nss.cc", 193 "cert/ct_log_verifier_nss.cc",
194 "cert/ct_objects_extractor_nss.cc", 194 "cert/ct_objects_extractor_nss.cc",
195 "cert/jwk_serializer_nss.cc", 195 "cert/jwk_serializer_nss.cc",
196 "cert/scoped_nss_types.h", 196 "cert/scoped_nss_types.h",
197 "cert/test_root_certs_nss.cc", 197 "cert/test_root_certs_nss.cc",
198 "cert/x509_util_nss.cc", 198 "cert/x509_util_nss.cc",
199 "cert/x509_util_nss.h", 199 "cert/x509_util_nss.h",
200 "ocsp/nss_ocsp.cc", 200 "cert_net/nss_ocsp.cc",
201 "ocsp/nss_ocsp.h", 201 "cert_net/nss_ocsp.h",
202 "quic/crypto/aead_base_decrypter_nss.cc", 202 "quic/crypto/aead_base_decrypter_nss.cc",
203 "quic/crypto/aead_base_encrypter_nss.cc", 203 "quic/crypto/aead_base_encrypter_nss.cc",
204 "quic/crypto/aes_128_gcm_12_decrypter_nss.cc", 204 "quic/crypto/aes_128_gcm_12_decrypter_nss.cc",
205 "quic/crypto/aes_128_gcm_12_encrypter_nss.cc", 205 "quic/crypto/aes_128_gcm_12_encrypter_nss.cc",
206 "quic/crypto/chacha20_poly1305_decrypter_nss.cc", 206 "quic/crypto/chacha20_poly1305_decrypter_nss.cc",
207 "quic/crypto/chacha20_poly1305_encrypter_nss.cc", 207 "quic/crypto/chacha20_poly1305_encrypter_nss.cc",
208 "quic/crypto/channel_id_nss.cc", 208 "quic/crypto/channel_id_nss.cc",
209 "quic/crypto/p256_key_exchange_nss.cc", 209 "quic/crypto/p256_key_exchange_nss.cc",
210 "socket/nss_ssl_util.cc", 210 "socket/nss_ssl_util.cc",
211 "socket/nss_ssl_util.h", 211 "socket/nss_ssl_util.h",
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 "third_party/mozilla_security_manager/nsNSSCertificateDB.h", 335 "third_party/mozilla_security_manager/nsNSSCertificateDB.h",
336 "third_party/mozilla_security_manager/nsPKCS12Blob.cpp", 336 "third_party/mozilla_security_manager/nsPKCS12Blob.cpp",
337 "third_party/mozilla_security_manager/nsPKCS12Blob.h", 337 "third_party/mozilla_security_manager/nsPKCS12Blob.h",
338 ] 338 ]
339 339
340 if (!is_ios && !use_openssl) { 340 if (!is_ios && !use_openssl) {
341 # These files are part of the partial implementation of NSS on iOS so 341 # These files are part of the partial implementation of NSS on iOS so
342 # keep them in that case. 342 # keep them in that case.
343 sources -= [ 343 sources -= [
344 "cert/test_root_certs_nss.cc", 344 "cert/test_root_certs_nss.cc",
345 "ocsp/nss_ocsp.cc", 345 "cert_net/nss_ocsp.cc",
346 "ocsp/nss_ocsp.h", 346 "cert_net/nss_ocsp.h",
347 ] 347 ]
348 } 348 }
349 } 349 }
350 350
351 if (!use_nss_certs) { 351 if (!use_nss_certs) {
352 sources -= [ 352 sources -= [
353 "ssl/client_cert_store_nss.cc", 353 "ssl/client_cert_store_nss.cc",
354 "ssl/client_cert_store_nss.h", 354 "ssl/client_cert_store_nss.h",
355 ] 355 ]
356 if (!is_ios) { 356 if (!is_ios) {
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 "base/net_util_mac.cc", 467 "base/net_util_mac.cc",
468 "base/net_util_mac.h", 468 "base/net_util_mac.h",
469 "base/network_change_notifier_mac.cc", 469 "base/network_change_notifier_mac.cc",
470 "base/network_config_watcher_mac.cc", 470 "base/network_config_watcher_mac.cc",
471 "base/platform_mime_util_mac.mm", 471 "base/platform_mime_util_mac.mm",
472 "cert/cert_verify_proc_nss.cc", 472 "cert/cert_verify_proc_nss.cc",
473 "cert/cert_verify_proc_nss.h", 473 "cert/cert_verify_proc_nss.h",
474 "cert/test_root_certs_nss.cc", 474 "cert/test_root_certs_nss.cc",
475 "cert/x509_util_nss.cc", 475 "cert/x509_util_nss.cc",
476 "cert/x509_util_nss.h", 476 "cert/x509_util_nss.h",
477 "ocsp/nss_ocsp.cc", 477 "cert_net/nss_ocsp.cc",
478 "ocsp/nss_ocsp.h", 478 "cert_net/nss_ocsp.h",
479 "proxy/proxy_resolver_mac.cc", 479 "proxy/proxy_resolver_mac.cc",
480 "proxy/proxy_server_mac.cc", 480 "proxy/proxy_server_mac.cc",
481 ] 481 ]
482 set_sources_assignment_filter(sources_assignment_filter) 482 set_sources_assignment_filter(sources_assignment_filter)
483 483
484 sources -= [ "disk_cache/blockfile/file_posix.cc" ] 484 sources -= [ "disk_cache/blockfile/file_posix.cc" ]
485 libs = [ 485 libs = [
486 "CFNetwork.framework", 486 "CFNetwork.framework",
487 "MobileCoreServices.framework", 487 "MobileCoreServices.framework",
488 "Security.framework", 488 "Security.framework",
(...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after
1423 "http/http_auth_gssapi_posix_unittest.cc", 1423 "http/http_auth_gssapi_posix_unittest.cc",
1424 "http/http_auth_handler_negotiate_unittest.cc", 1424 "http/http_auth_handler_negotiate_unittest.cc",
1425 "http/mock_gssapi_library_posix.cc", 1425 "http/mock_gssapi_library_posix.cc",
1426 "http/mock_gssapi_library_posix.h", 1426 "http/mock_gssapi_library_posix.h",
1427 ] 1427 ]
1428 } 1428 }
1429 1429
1430 if (use_openssl || (!is_desktop_linux && !is_chromeos && !is_ios)) { 1430 if (use_openssl || (!is_desktop_linux && !is_chromeos && !is_ios)) {
1431 # Only include this test when on Posix and using NSS for 1431 # Only include this test when on Posix and using NSS for
1432 # cert verification or on iOS (which also uses NSS for certs). 1432 # cert verification or on iOS (which also uses NSS for certs).
1433 sources -= [ "ocsp/nss_ocsp_unittest.cc" ] 1433 sources -= [ "cert_net/nss_ocsp_unittest.cc" ]
1434 } 1434 }
1435 1435
1436 if (!use_openssl_certs) { 1436 if (!use_openssl_certs) {
1437 sources -= [ "ssl/openssl_client_key_store_unittest.cc" ] 1437 sources -= [ "ssl/openssl_client_key_store_unittest.cc" ]
1438 } 1438 }
1439 1439
1440 if (!enable_websockets) { 1440 if (!enable_websockets) {
1441 sources -= [ 1441 sources -= [
1442 "server/http_connection_unittest.cc", 1442 "server/http_connection_unittest.cc",
1443 "server/http_server_response_info_unittest.cc", 1443 "server/http_server_response_info_unittest.cc",
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
1640 } else { 1640 } else {
1641 sources -= [ "proxy/proxy_resolver_perftest.cc" ] 1641 sources -= [ "proxy/proxy_resolver_perftest.cc" ]
1642 } 1642 }
1643 1643
1644 if (is_win && icu_use_data_file) { 1644 if (is_win && icu_use_data_file) {
1645 # This is needed to trigger the dll copy step on windows. 1645 # This is needed to trigger the dll copy step on windows.
1646 # TODO(mark): Specifying this here shouldn't be necessary. 1646 # TODO(mark): Specifying this here shouldn't be necessary.
1647 deps += [ "//third_party/icu:icudata" ] 1647 deps += [ "//third_party/icu:icudata" ]
1648 } 1648 }
1649 } 1649 }
OLDNEW
« no previous file with comments | « chromecast/browser/url_request_context_factory.cc ('k') | net/cert_net/nss_ocsp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698