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

Side by Side Diff: net/net_common.gypi

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 | « net/net.gypi ('k') | net/ocsp/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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 # This target is included in both 'net' and 'net_small'. 6 # This target is included in both 'net' and 'net_small'.
7 'type': '<(component)', 7 'type': '<(component)',
8 'variables': { 'enable_wexit_time_destructors': 1, }, 8 'variables': { 'enable_wexit_time_destructors': 1, },
9 'dependencies': [ 9 'dependencies': [
10 '../base/base.gyp:base', 10 '../base/base.gyp:base',
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 'cert/nss_cert_database_chromeos.cc', 140 'cert/nss_cert_database_chromeos.cc',
141 'cert/nss_cert_database_chromeos.h', 141 'cert/nss_cert_database_chromeos.h',
142 'cert/nss_profile_filter_chromeos.cc', 142 'cert/nss_profile_filter_chromeos.cc',
143 'cert/nss_profile_filter_chromeos.h', 143 'cert/nss_profile_filter_chromeos.h',
144 'cert/scoped_nss_types.h', 144 'cert/scoped_nss_types.h',
145 'cert/sha256_legacy_support_nss_win.cc', 145 'cert/sha256_legacy_support_nss_win.cc',
146 'cert/test_root_certs_nss.cc', 146 'cert/test_root_certs_nss.cc',
147 'cert/x509_certificate_nss.cc', 147 'cert/x509_certificate_nss.cc',
148 'cert/x509_util_nss.cc', 148 'cert/x509_util_nss.cc',
149 'cert/x509_util_nss.h', 149 'cert/x509_util_nss.h',
150 'ocsp/nss_ocsp.cc', 150 'cert_net/nss_ocsp.cc',
151 'ocsp/nss_ocsp.h', 151 'cert_net/nss_ocsp.h',
152 'quic/crypto/aead_base_decrypter_nss.cc', 152 'quic/crypto/aead_base_decrypter_nss.cc',
153 'quic/crypto/aead_base_encrypter_nss.cc', 153 'quic/crypto/aead_base_encrypter_nss.cc',
154 'quic/crypto/aes_128_gcm_12_decrypter_nss.cc', 154 'quic/crypto/aes_128_gcm_12_decrypter_nss.cc',
155 'quic/crypto/aes_128_gcm_12_encrypter_nss.cc', 155 'quic/crypto/aes_128_gcm_12_encrypter_nss.cc',
156 'quic/crypto/chacha20_poly1305_decrypter_nss.cc', 156 'quic/crypto/chacha20_poly1305_decrypter_nss.cc',
157 'quic/crypto/chacha20_poly1305_encrypter_nss.cc', 157 'quic/crypto/chacha20_poly1305_encrypter_nss.cc',
158 'quic/crypto/channel_id_nss.cc', 158 'quic/crypto/channel_id_nss.cc',
159 'quic/crypto/p256_key_exchange_nss.cc', 159 'quic/crypto/p256_key_exchange_nss.cc',
160 'socket/nss_ssl_util.cc', 160 'socket/nss_ssl_util.cc',
161 'socket/nss_ssl_util.h', 161 'socket/nss_ssl_util.h',
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 }, 266 },
267 { # else: OS is not in the above list 267 { # else: OS is not in the above list
268 'sources!': [ 268 'sources!': [
269 'base/crypto_module_nss.cc', 269 'base/crypto_module_nss.cc',
270 'base/keygen_handler_nss.cc', 270 'base/keygen_handler_nss.cc',
271 'cert/cert_database_nss.cc', 271 'cert/cert_database_nss.cc',
272 'cert/nss_cert_database.cc', 272 'cert/nss_cert_database.cc',
273 'cert/nss_cert_database.h', 273 'cert/nss_cert_database.h',
274 'cert/test_root_certs_nss.cc', 274 'cert/test_root_certs_nss.cc',
275 'cert/x509_certificate_nss.cc', 275 'cert/x509_certificate_nss.cc',
276 'ocsp/nss_ocsp.cc', 276 'cert_net/nss_ocsp.cc',
277 'ocsp/nss_ocsp.h', 277 'cert_net/nss_ocsp.h',
278 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 278 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
279 'third_party/mozilla_security_manager/nsKeygenHandler.h', 279 'third_party/mozilla_security_manager/nsKeygenHandler.h',
280 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 280 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
281 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 281 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
282 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 282 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
283 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 283 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
284 ], 284 ],
285 }, 285 },
286 ], 286 ],
287 [ 'use_nss != 1', { 287 [ 'use_nss != 1', {
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 ['include', '^base/network_config_watcher_mac\\.cc$'], 410 ['include', '^base/network_config_watcher_mac\\.cc$'],
411 ['include', '^base/platform_mime_util_mac\\.mm$'], 411 ['include', '^base/platform_mime_util_mac\\.mm$'],
412 # The iOS implementation only partially uses NSS and thus does not 412 # The iOS implementation only partially uses NSS and thus does not
413 # defines |use_nss|. In particular the |USE_NSS| preprocessor 413 # defines |use_nss|. In particular the |USE_NSS| preprocessor
414 # definition is not used. The following files are needed though: 414 # definition is not used. The following files are needed though:
415 ['include', '^cert/cert_verify_proc_nss\\.cc$'], 415 ['include', '^cert/cert_verify_proc_nss\\.cc$'],
416 ['include', '^cert/cert_verify_proc_nss\\.h$'], 416 ['include', '^cert/cert_verify_proc_nss\\.h$'],
417 ['include', '^cert/test_root_certs_nss\\.cc$'], 417 ['include', '^cert/test_root_certs_nss\\.cc$'],
418 ['include', '^cert/x509_util_nss\\.cc$'], 418 ['include', '^cert/x509_util_nss\\.cc$'],
419 ['include', '^cert/x509_util_nss\\.h$'], 419 ['include', '^cert/x509_util_nss\\.h$'],
420 ['include', '^cert_net/nss_ocsp\\.cc$'],
421 ['include', '^cert_net/nss_ocsp\\.h$'],
420 ['include', '^proxy/proxy_resolver_mac\\.cc$'], 422 ['include', '^proxy/proxy_resolver_mac\\.cc$'],
421 ['include', '^proxy/proxy_server_mac\\.cc$'], 423 ['include', '^proxy/proxy_server_mac\\.cc$'],
422 ['include', '^ocsp/nss_ocsp\\.cc$'],
423 ['include', '^ocsp/nss_ocsp\\.h$'],
424 ], 424 ],
425 }], 425 }],
426 ], 426 ],
427 } 427 }
OLDNEW
« no previous file with comments | « net/net.gypi ('k') | net/ocsp/nss_ocsp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698