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

Side by Side Diff: net/net.gyp

Issue 1838513002: Revert of Adding iOS OpenSSL Implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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/cert/x509_certificate_openssl_ios.cc ('k') | net/net.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 'conditions': [ 9 'conditions': [
10 ['chromeos==1 or embedded==1 or OS=="ios"', { 10 ['chromeos==1 or embedded==1 or OS=="ios"', {
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 ], 233 ],
234 }], 234 }],
235 [ 'use_nss_verifier == 0 and OS == "ios"', { 235 [ 'use_nss_verifier == 0 and OS == "ios"', {
236 # Only include these files on iOS when using NSS for cert 236 # Only include these files on iOS when using NSS for cert
237 # verification. 237 # verification.
238 'sources!': [ 238 'sources!': [
239 'cert/x509_util_ios.cc', 239 'cert/x509_util_ios.cc',
240 'cert/x509_util_ios.h', 240 'cert/x509_util_ios.h',
241 ], 241 ],
242 }], 242 }],
243 [ 'use_nss_verifier == 1 and OS == "ios"', {
244 'sources!': [
245 'cert/cert_verify_proc_ios.cc',
246 'cert/cert_verify_proc_ios.h',
247 'cert/x509_certificate_openssl_ios.cc',
248 ],
249 }],
250 [ 'use_openssl==1', { 243 [ 'use_openssl==1', {
251 'sources!': [ 244 'sources!': [
252 'quic/test_tools/crypto_test_utils_nss.cc', 245 'quic/test_tools/crypto_test_utils_nss.cc',
253 ], 246 ],
254 }, { # else !use_openssl: remove the unneeded files and pull in NSS. 247 }, { # else !use_openssl: remove the unneeded files and pull in NSS.
255 'sources!': [ 248 'sources!': [
256 'quic/test_tools/crypto_test_utils_openssl.cc', 249 'quic/test_tools/crypto_test_utils_openssl.cc',
257 'ssl/ssl_client_session_cache_openssl_unittest.cc', 250 'ssl/ssl_client_session_cache_openssl_unittest.cc',
258 ], 251 ],
259 }, 252 },
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 'test_data_files': [ 357 'test_data_files': [
365 'data/certificate_policies_unittest/', 358 'data/certificate_policies_unittest/',
366 'data/name_constraints_unittest/', 359 'data/name_constraints_unittest/',
367 'data/parse_certificate_unittest/', 360 'data/parse_certificate_unittest/',
368 'data/ssl/certificates/', 361 'data/ssl/certificates/',
369 'data/test.html', 362 'data/test.html',
370 'data/url_request_unittest/', 363 'data/url_request_unittest/',
371 'data/verify_certificate_chain_unittest/', 364 'data/verify_certificate_chain_unittest/',
372 'data/verify_name_match_unittest/names/', 365 'data/verify_name_match_unittest/names/',
373 'data/verify_signed_data_unittest/', 366 'data/verify_signed_data_unittest/',
374 'third_party/nist-pkits/',
375 ], 367 ],
376 'test_data_prefix': 'net', 368 'test_data_prefix': 'net',
377 }, 369 },
378 'includes': [ '../build/copy_test_data_ios.gypi' ], 370 'includes': [ '../build/copy_test_data_ios.gypi' ],
379 }, 371 },
380 ], 372 ],
381 'sources!': [ 373 'sources!': [
382 # TODO(droger): The following tests are disabled because the 374 # TODO(droger): The following tests are disabled because the
383 # implementation is missing or incomplete. 375 # implementation is missing or incomplete.
384 # KeygenHandler::GenKeyAndSignChallenge() is not ported to iOS. 376 # KeygenHandler::GenKeyAndSignChallenge() is not ported to iOS.
(...skipping 1326 matching lines...) Expand 10 before | Expand all | Expand 10 after
1711 '../build/isolate.gypi', 1703 '../build/isolate.gypi',
1712 ], 1704 ],
1713 'sources': [ 1705 'sources': [
1714 'net_unittests.isolate', 1706 'net_unittests.isolate',
1715 ], 1707 ],
1716 }, 1708 },
1717 ], 1709 ],
1718 }], 1710 }],
1719 ], 1711 ],
1720 } 1712 }
OLDNEW
« no previous file with comments | « net/cert/x509_certificate_openssl_ios.cc ('k') | net/net.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698