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

Side by Side Diff: net/net.gyp

Issue 4696004: openssl build fixes, and tidy the build files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: leave build files alone except for the minimal fixes 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
« net/base/net_test_suite.h ('K') | « net/base/net_test_suite.h ('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 706 matching lines...) Expand 10 before | Expand all | Expand 10 after
717 ], 717 ],
718 }], 718 }],
719 ['chromeos==1', { 719 ['chromeos==1', {
720 'sources!': [ 720 'sources!': [
721 'proxy/proxy_config_service_linux.cc', 721 'proxy/proxy_config_service_linux.cc',
722 'proxy/proxy_config_service_linux.h', 722 'proxy/proxy_config_service_linux.h',
723 ], 723 ],
724 }], 724 }],
725 ['use_openssl==1', { 725 ['use_openssl==1', {
726 'sources!': [ 726 'sources!': [
727 'ocsp/nss_ocsp.cc',
728 'ocsp/nss_ocsp.h',
727 'socket/dns_cert_provenance_check.cc', 729 'socket/dns_cert_provenance_check.cc',
728 'socket/dns_cert_provenance_check.h', 730 'socket/dns_cert_provenance_check.h',
729 'socket/ssl_client_socket_nss.cc', 731 'socket/ssl_client_socket_nss.cc',
730 'socket/ssl_client_socket_nss.h', 732 'socket/ssl_client_socket_nss.h',
731 'socket/ssl_client_socket_nss_factory.cc', 733 'socket/ssl_client_socket_nss_factory.cc',
732 'socket/ssl_client_socket_nss_factory.h', 734 'socket/ssl_client_socket_nss_factory.h',
733 ], 735 ],
734 }, 736 },
735 { # else !use_openssl: remove the unneeded files 737 { # else !use_openssl: remove the unneeded files
736 'sources!': [ 738 'sources!': [
(...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after
1439 ], 1441 ],
1440 }], 1442 }],
1441 ], 1443 ],
1442 } 1444 }
1443 1445
1444 # Local Variables: 1446 # Local Variables:
1445 # tab-width:2 1447 # tab-width:2
1446 # indent-tabs-mode:nil 1448 # indent-tabs-mode:nil
1447 # End: 1449 # End:
1448 # vim: set expandtab tabstop=2 shiftwidth=2: 1450 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« net/base/net_test_suite.h ('K') | « net/base/net_test_suite.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698