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

Side by Side Diff: net/net.gyp

Issue 1808963004: Adding macro to enable changing SSL library (Part 1) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove remoting_nacl change. Created 4 years, 9 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/cert/x509_util_nss.h ('k') | net/net_common.gypi » ('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 'linux_link_kerberos%': 0, 8 'linux_link_kerberos%': 0,
9 # Enables BidirectionalStream; Used in cronet, disabled by default. 9 # Enables BidirectionalStream; Used in cronet, disabled by default.
10 'enable_bidirectional_stream%': 0, 10 'enable_bidirectional_stream%': 0,
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 'cert/nss_profile_filter_chromeos_unittest.cc', 199 'cert/nss_profile_filter_chromeos_unittest.cc',
200 'ssl/client_cert_store_nss_unittest.cc', 200 'ssl/client_cert_store_nss_unittest.cc',
201 ], 201 ],
202 }], 202 }],
203 [ 'use_openssl == 1', { 203 [ 'use_openssl == 1', {
204 # Avoid compiling/linking with the system library. 204 # Avoid compiling/linking with the system library.
205 'dependencies': [ 205 'dependencies': [
206 '../third_party/boringssl/boringssl.gyp:boringssl', 206 '../third_party/boringssl/boringssl.gyp:boringssl',
207 ], 207 ],
208 }], 208 }],
209 [ 'use_nss_certs == 1 or OS == "ios" or use_openssl == 0', { 209 [ 'use_nss_verifier == 1', {
210 'conditions': [ 210 'conditions': [
211 [ 'desktop_linux == 1 or chromeos == 1', { 211 [ 'desktop_linux == 1 or chromeos == 1', {
212 'dependencies': [ 212 'dependencies': [
213 '../build/linux/system.gyp:ssl', 213 '../build/linux/system.gyp:ssl',
214 ], 214 ],
215 }, { # desktop_linux == 0 and chromeos == 0 215 }, { # desktop_linux == 0 and chromeos == 0
216 'dependencies': [ 216 'dependencies': [
217 '../third_party/nss/nss.gyp:nspr', 217 '../third_party/nss/nss.gyp:nspr',
218 '../third_party/nss/nss.gyp:nss', 218 '../third_party/nss/nss.gyp:nss',
219 'third_party/nss/ssl.gyp:libssl', 219 'third_party/nss/ssl.gyp:libssl',
(...skipping 13 matching lines...) Expand all
233 'http/http_auth_gssapi_posix_unittest.cc', 233 'http/http_auth_gssapi_posix_unittest.cc',
234 'http/mock_gssapi_library_posix.cc', 234 'http/mock_gssapi_library_posix.cc',
235 'http/mock_gssapi_library_posix.h', 235 'http/mock_gssapi_library_posix.h',
236 ], 236 ],
237 }], 237 }],
238 [ 'use_kerberos==0', { 238 [ 'use_kerberos==0', {
239 'sources!': [ 239 'sources!': [
240 'http/http_auth_handler_negotiate_unittest.cc', 240 'http/http_auth_handler_negotiate_unittest.cc',
241 ], 241 ],
242 }], 242 }],
243 [ 'use_nss_certs == 0 and OS != "ios"', { 243 [ 'use_nss_verifier == 0', {
244 # Only include this test when using system NSS for cert verification 244 # Only include this test when using NSS for cert verification.
245 # or on iOS (which also uses NSS for certs).
246 'sources!': [ 245 'sources!': [
247 'cert_net/nss_ocsp_unittest.cc', 246 'cert_net/nss_ocsp_unittest.cc',
248 ], 247 ],
249 }], 248 }],
249 [ 'use_nss_verifier == 0 and OS == "ios"', {
250 # Only include these files on iOS when using NSS for cert
251 # verification.
252 'sources!': [
253 'cert/x509_util_ios.cc',
254 'cert/x509_util_ios.h',
255 ],
256 }],
250 [ 'use_openssl==1', { 257 [ 'use_openssl==1', {
251 'sources!': [ 258 'sources!': [
252 'quic/test_tools/crypto_test_utils_nss.cc', 259 'quic/test_tools/crypto_test_utils_nss.cc',
253 ], 260 ],
254 }, { # else !use_openssl: remove the unneeded files and pull in NSS. 261 }, { # else !use_openssl: remove the unneeded files and pull in NSS.
255 'sources!': [ 262 'sources!': [
256 'quic/test_tools/crypto_test_utils_openssl.cc', 263 'quic/test_tools/crypto_test_utils_openssl.cc',
257 'ssl/ssl_client_session_cache_openssl_unittest.cc', 264 'ssl/ssl_client_session_cache_openssl_unittest.cc',
258 ], 265 ],
259 }, 266 },
260 ], 267 ],
261 [ 'use_openssl_certs == 0', { 268 [ 'use_openssl_certs == 0', {
262 'sources!': [ 269 'sources!': [
263 'ssl/openssl_client_key_store_unittest.cc', 270 'ssl/openssl_client_key_store_unittest.cc',
264 ], 271 ],
265 }], 272 }],
266 [ 'enable_websockets != 1', { 273 [ 'enable_websockets != 1', {
267 'sources/': [ 274 'sources/': [
268 ['exclude', '^websockets/'], 275 ['exclude', '^websockets/'],
269 ['exclude', '^server/'], 276 ['exclude', '^server/'],
270 ], 277 ],
271 'dependencies!': [ 278 'dependencies!': [
272 'http_server', 279 'http_server',
273 ], 280 ],
274 }], 281 }],
275 ['disable_file_support==1', { 282 ['disable_file_support==1', {
276 'sources!': [ 283 'sources!': [
277 'base/directory_lister_unittest.cc', 284 'base/directory_lister_unittest.cc',
278 'base/directory_listing_unittest.cc', 285 'base/directory_listing_unittest.cc',
279 » 'url_request/url_request_file_dir_job_unittest.cc', 286 'url_request/url_request_file_dir_job_unittest.cc',
280 'url_request/url_request_file_job_unittest.cc', 287 'url_request/url_request_file_job_unittest.cc',
281 ], 288 ],
282 }], 289 }],
283 [ 'disable_ftp_support==1', { 290 [ 'disable_ftp_support==1', {
284 'sources/': [ 291 'sources/': [
285 ['exclude', '^ftp/'], 292 ['exclude', '^ftp/'],
286 ], 293 ],
287 'sources!': [ 294 'sources!': [
288 'url_request/url_request_ftp_job_unittest.cc', 295 'url_request/url_request_ftp_job_unittest.cc',
289 ], 296 ],
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 'variables': { 376 'variables': {
370 'test_data_files': [ 377 'test_data_files': [
371 'data/certificate_policies_unittest/', 378 'data/certificate_policies_unittest/',
372 'data/name_constraints_unittest/', 379 'data/name_constraints_unittest/',
373 'data/parse_certificate_unittest/', 380 'data/parse_certificate_unittest/',
374 'data/ssl/certificates/', 381 'data/ssl/certificates/',
375 'data/test.html', 382 'data/test.html',
376 'data/url_request_unittest/', 383 'data/url_request_unittest/',
377 'data/verify_certificate_chain_unittest/', 384 'data/verify_certificate_chain_unittest/',
378 'data/verify_name_match_unittest/names/', 385 'data/verify_name_match_unittest/names/',
386 'data/verify_signed_data_unittest/',
379 ], 387 ],
380 'test_data_prefix': 'net', 388 'test_data_prefix': 'net',
381 }, 389 },
382 'includes': [ '../build/copy_test_data_ios.gypi' ], 390 'includes': [ '../build/copy_test_data_ios.gypi' ],
383 }, 391 },
384 ], 392 ],
385 'sources!': [ 393 'sources!': [
386 # TODO(droger): The following tests are disabled because the 394 # TODO(droger): The following tests are disabled because the
387 # implementation is missing or incomplete. 395 # implementation is missing or incomplete.
388 # KeygenHandler::GenKeyAndSignChallenge() is not ported to iOS. 396 # KeygenHandler::GenKeyAndSignChallenge() is not ported to iOS.
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 'sources!': [ 626 'sources!': [
619 'test/spawned_test_server/base_test_server.cc', 627 'test/spawned_test_server/base_test_server.cc',
620 'test/spawned_test_server/base_test_server.h', 628 'test/spawned_test_server/base_test_server.h',
621 'test/spawned_test_server/local_test_server.cc', 629 'test/spawned_test_server/local_test_server.cc',
622 'test/spawned_test_server/local_test_server.h', 630 'test/spawned_test_server/local_test_server.h',
623 'test/spawned_test_server/local_test_server_posix.cc', 631 'test/spawned_test_server/local_test_server_posix.cc',
624 'test/spawned_test_server/local_test_server_win.cc', 632 'test/spawned_test_server/local_test_server_win.cc',
625 'test/spawned_test_server/spawned_test_server.h', 633 'test/spawned_test_server/spawned_test_server.h',
626 ], 634 ],
627 }], 635 }],
628 ['use_nss_certs == 1 or OS == "ios"', { 636 ['use_nss_verifier == 1', {
629 'conditions': [ 637 'conditions': [
630 [ 'desktop_linux == 1 or chromeos == 1', { 638 [ 'desktop_linux == 1 or chromeos == 1', {
631 'dependencies': [ 639 'dependencies': [
632 '../build/linux/system.gyp:ssl', 640 '../build/linux/system.gyp:ssl',
633 ], 641 ],
634 }, { # desktop_linux == 0 and chromeos == 0 642 }, { # desktop_linux == 0 and chromeos == 0
635 'dependencies': [ 643 'dependencies': [
636 '../third_party/nss/nss.gyp:nspr', 644 '../third_party/nss/nss.gyp:nspr',
637 '../third_party/nss/nss.gyp:nss', 645 '../third_party/nss/nss.gyp:nss',
638 'third_party/nss/ssl.gyp:libssl', 646 'third_party/nss/ssl.gyp:libssl',
(...skipping 1076 matching lines...) Expand 10 before | Expand all | Expand 10 after
1715 '../build/isolate.gypi', 1723 '../build/isolate.gypi',
1716 ], 1724 ],
1717 'sources': [ 1725 'sources': [
1718 'net_unittests.isolate', 1726 'net_unittests.isolate',
1719 ], 1727 ],
1720 }, 1728 },
1721 ], 1729 ],
1722 }], 1730 }],
1723 ], 1731 ],
1724 } 1732 }
OLDNEW
« no previous file with comments | « net/cert/x509_util_nss.h ('k') | net/net_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698