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

Side by Side Diff: net/net.gyp

Issue 5014001: Reverted because openssl_helper needs to build even on non-openssl builds... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | no next file » | 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) 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 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 259 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
260 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp', 260 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
261 'third_party/mozilla_security_manager/nsNSSCertTrust.h', 261 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
262 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 262 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
263 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 263 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
264 ], 264 ],
265 }, 265 },
266 ], 266 ],
267 [ 'use_openssl==1', { 267 [ 'use_openssl==1', {
268 'sources!': [ 268 'sources!': [
269 'base/cert_database_nss.cc',
269 'base/dnssec_keyset.cc', 270 'base/dnssec_keyset.cc',
270 'base/dnssec_keyset.h', 271 'base/dnssec_keyset.h',
272 'base/keygen_handler_nss.cc',
273 'base/nss_memio.c',
274 'base/nss_memio.h',
275 'base/x509_certificate_nss.cc',
271 'third_party/mozilla_security_manager/nsKeygenHandler.cpp', 276 'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
272 'third_party/mozilla_security_manager/nsKeygenHandler.h', 277 'third_party/mozilla_security_manager/nsKeygenHandler.h',
273 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp', 278 'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
274 'third_party/mozilla_security_manager/nsNSSCertificateDB.h', 279 'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
275 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp', 280 'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
276 'third_party/mozilla_security_manager/nsNSSCertTrust.h', 281 'third_party/mozilla_security_manager/nsNSSCertTrust.h',
277 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp', 282 'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
278 'third_party/mozilla_security_manager/nsPKCS12Blob.h', 283 'third_party/mozilla_security_manager/nsPKCS12Blob.h',
279 ], 284 ],
280 }, 285 },
286 { # else: not using openssl.
287 'sources!': [
288 'base/cert_database_openssl.cc',
289 'base/keygen_handler_openssl.cc',
290 'base/openssl_util.cc',
291 'base/openssl_util.h',
292 'base/x509_certificate_openssl.cc',
293 'base/x509_openssl_util.cc',
294 'base/x509_openssl_util.h',
295 ],
296 },
281 ], 297 ],
282 [ 'OS == "win"', { 298 [ 'OS == "win"', {
283 'dependencies': [ 299 'dependencies': [
284 '../third_party/nss/nss.gyp:nss', 300 '../third_party/nss/nss.gyp:nss',
285 'tld_cleanup', 301 'tld_cleanup',
286 ], 302 ],
287 }, 303 },
288 { # else: OS != "win" 304 { # else: OS != "win"
289 'dependencies': [ 305 'dependencies': [
290 '../third_party/libevent/libevent.gyp:libevent', 306 '../third_party/libevent/libevent.gyp:libevent',
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
701 ], 717 ],
702 }], 718 }],
703 ['chromeos==1', { 719 ['chromeos==1', {
704 'sources!': [ 720 'sources!': [
705 'proxy/proxy_config_service_linux.cc', 721 'proxy/proxy_config_service_linux.cc',
706 'proxy/proxy_config_service_linux.h', 722 'proxy/proxy_config_service_linux.h',
707 ], 723 ],
708 }], 724 }],
709 ['use_openssl==1', { 725 ['use_openssl==1', {
710 'sources!': [ 726 'sources!': [
727 'ocsp/nss_ocsp.cc',
728 'ocsp/nss_ocsp.h',
711 'socket/dns_cert_provenance_check.cc', 729 'socket/dns_cert_provenance_check.cc',
712 'socket/dns_cert_provenance_check.h', 730 'socket/dns_cert_provenance_check.h',
731 'socket/ssl_client_socket_nss.cc',
732 'socket/ssl_client_socket_nss.h',
733 'socket/ssl_client_socket_nss_factory.cc',
734 'socket/ssl_client_socket_nss_factory.h',
735 ],
736 },
737 { # else !use_openssl: remove the unneeded files
738 'sources!': [
739 'socket/ssl_client_socket_openssl.cc',
740 'socket/ssl_client_socket_openssl.h',
713 ], 741 ],
714 }, 742 },
715 ], 743 ],
716 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 744 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
717 'dependencies': [ 745 'dependencies': [
718 '../build/linux/system.gyp:gconf', 746 '../build/linux/system.gyp:gconf',
719 '../build/linux/system.gyp:gdk', 747 '../build/linux/system.gyp:gdk',
720 ], 748 ],
721 'conditions': [ 749 'conditions': [
722 ['use_openssl==1', { 750 ['use_openssl==1', {
(...skipping 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
1414 ], 1442 ],
1415 }], 1443 }],
1416 ], 1444 ],
1417 } 1445 }
1418 1446
1419 # Local Variables: 1447 # Local Variables:
1420 # tab-width:2 1448 # tab-width:2
1421 # indent-tabs-mode:nil 1449 # indent-tabs-mode:nil
1422 # End: 1450 # End:
1423 # vim: set expandtab tabstop=2 shiftwidth=2: 1451 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698