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

Side by Side Diff: net/net.gyp

Issue 6962044: Revert 87315 - Revert 87309 - Second attempt to fix linux redux builder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « crypto/crypto.gyp ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 723 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 '../build/linux/system.gyp:libresolv', 734 '../build/linux/system.gyp:libresolv',
735 ], 735 ],
736 'conditions': [ 736 'conditions': [
737 ['use_openssl==1', { 737 ['use_openssl==1', {
738 'dependencies': [ 738 'dependencies': [
739 '../third_party/openssl/openssl.gyp:openssl', 739 '../third_party/openssl/openssl.gyp:openssl',
740 ], 740 ],
741 }, 741 },
742 { # else use_openssl==0, use NSS 742 { # else use_openssl==0, use NSS
743 'dependencies': [ 743 'dependencies': [
744 '../build/linux/system.gyp:nss', 744 '../build/linux/system.gyp:ssl',
745 ], 745 ],
746 }], 746 }],
747 ], 747 ],
748 }, 748 },
749 { # else: OS is not in the above list 749 { # else: OS is not in the above list
750 'sources!': [ 750 'sources!': [
751 'base/cert_database_nss.cc', 751 'base/cert_database_nss.cc',
752 'base/crypto_module_nss.cc', 752 'base/crypto_module_nss.cc',
753 'base/keygen_handler_nss.cc', 753 'base/keygen_handler_nss.cc',
754 'base/test_root_certs_nss.cc', 754 'base/test_root_certs_nss.cc',
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
992 ], 992 ],
993 'conditions': [ 993 'conditions': [
994 ['chromeos==1', { 994 ['chromeos==1', {
995 'sources!': [ 995 'sources!': [
996 'proxy/proxy_config_service_linux_unittest.cc', 996 'proxy/proxy_config_service_linux_unittest.cc',
997 ], 997 ],
998 }], 998 }],
999 [ 'toolkit_uses_gtk == 1', { 999 [ 'toolkit_uses_gtk == 1', {
1000 'dependencies': [ 1000 'dependencies': [
1001 '../build/linux/system.gyp:gtk', 1001 '../build/linux/system.gyp:gtk',
1002 '../build/linux/system.gyp:nss', 1002 '../build/linux/system.gyp:ssl',
1003 ], 1003 ],
1004 }, 1004 },
1005 { # else: OS is not in the above list 1005 { # else: OS is not in the above list
1006 'sources!': [ 1006 'sources!': [
1007 'base/cert_database_nss_unittest.cc', 1007 'base/cert_database_nss_unittest.cc',
1008 ], 1008 ],
1009 } 1009 }
1010 ], 1010 ],
1011 [ 'os_posix == 1 and OS != "mac"', { 1011 [ 'os_posix == 1 and OS != "mac"', {
1012 'conditions': [ 1012 'conditions': [
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
1168 ], 1168 ],
1169 }], 1169 }],
1170 ['os_posix == 1 and OS != "mac"', { 1170 ['os_posix == 1 and OS != "mac"', {
1171 'conditions': [ 1171 'conditions': [
1172 ['use_openssl==1', { 1172 ['use_openssl==1', {
1173 'dependencies': [ 1173 'dependencies': [
1174 '../third_party/openssl/openssl.gyp:openssl', 1174 '../third_party/openssl/openssl.gyp:openssl',
1175 ], 1175 ],
1176 }, { 1176 }, {
1177 'dependencies': [ 1177 'dependencies': [
1178 '../build/linux/system.gyp:nss', 1178 '../build/linux/system.gyp:ssl',
1179 ], 1179 ],
1180 }], 1180 }],
1181 ], 1181 ],
1182 }], 1182 }],
1183 ['os_posix == 1 and OS != "mac"', { 1183 ['os_posix == 1 and OS != "mac"', {
1184 'conditions': [ 1184 'conditions': [
1185 ['linux_use_tcmalloc==1', { 1185 ['linux_use_tcmalloc==1', {
1186 'dependencies': [ 1186 'dependencies': [
1187 '../base/allocator/allocator.gyp:allocator', 1187 '../base/allocator/allocator.gyp:allocator',
1188 ], 1188 ],
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
1436 ], 1436 ],
1437 }], 1437 }],
1438 ], 1438 ],
1439 } 1439 }
1440 1440
1441 # Local Variables: 1441 # Local Variables:
1442 # tab-width:2 1442 # tab-width:2
1443 # indent-tabs-mode:nil 1443 # indent-tabs-mode:nil
1444 # End: 1444 # End:
1445 # vim: set expandtab tabstop=2 shiftwidth=2: 1445 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « crypto/crypto.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698