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

Side by Side Diff: net/net.gyp

Issue 5625012: Switch linux OpenSSL build to use custom openssl version (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove the system openssl build rule altogether, depend on third party directly Created 10 years 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_common.gypi ('k') | net/socket/ssl_client_socket_openssl.cc » ('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 (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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 'conditions': [ 230 'conditions': [
231 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 231 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
232 'dependencies': [ 232 'dependencies': [
233 '../build/linux/system.gyp:gconf', 233 '../build/linux/system.gyp:gconf',
234 '../build/linux/system.gyp:gdk', 234 '../build/linux/system.gyp:gdk',
235 '../build/linux/system.gyp:libresolv', 235 '../build/linux/system.gyp:libresolv',
236 ], 236 ],
237 'conditions': [ 237 'conditions': [
238 ['use_openssl==1', { 238 ['use_openssl==1', {
239 'dependencies': [ 239 'dependencies': [
240 '../build/linux/system.gyp:openssl', 240 '../third_party/openssl/openssl.gyp:openssl',
241 ], 241 ],
242 }, { # else: not using openssl. Use NSS. 242 }, { # else: not using openssl. Use NSS.
243 'dependencies': [ 243 'dependencies': [
244 '../build/linux/system.gyp:nss', 244 '../build/linux/system.gyp:nss',
245 ], 245 ],
246 }], 246 }],
247 ], 247 ],
248 }, 248 },
249 { # else: OS is not in the above list 249 { # else: OS is not in the above list
250 'sources!': [ 250 'sources!': [
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 }, 747 },
748 ], 748 ],
749 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 749 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
750 'dependencies': [ 750 'dependencies': [
751 '../build/linux/system.gyp:gconf', 751 '../build/linux/system.gyp:gconf',
752 '../build/linux/system.gyp:gdk', 752 '../build/linux/system.gyp:gdk',
753 ], 753 ],
754 'conditions': [ 754 'conditions': [
755 ['use_openssl==1', { 755 ['use_openssl==1', {
756 'dependencies': [ 756 'dependencies': [
757 '../build/linux/system.gyp:openssl', 757 '../third_party/openssl/openssl.gyp:openssl',
758 ], 758 ],
759 }, 759 },
760 { # else use_openssl==0, use NSS 760 { # else use_openssl==0, use NSS
761 'dependencies': [ 761 'dependencies': [
762 '../build/linux/system.gyp:nss', 762 '../build/linux/system.gyp:nss',
763 ], 763 ],
764 }], 764 }],
765 ], 765 ],
766 }, 766 },
767 { # else: OS is not in the above list 767 { # else: OS is not in the above list
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
1189 'dependencies': [ 1189 'dependencies': [
1190 '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto', 1190 '../chrome/browser/sync/protocol/sync_proto.gyp:sync_proto',
1191 '../chrome/browser/policy/proto/device_management_proto.gyp:device_m anagement_proto', 1191 '../chrome/browser/policy/proto/device_management_proto.gyp:device_m anagement_proto',
1192 '../third_party/protobuf/protobuf.gyp:py_proto', 1192 '../third_party/protobuf/protobuf.gyp:py_proto',
1193 ], 1193 ],
1194 }], 1194 }],
1195 ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 1195 ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
1196 'conditions': [ 1196 'conditions': [
1197 ['use_openssl==1', { 1197 ['use_openssl==1', {
1198 'dependencies': [ 1198 'dependencies': [
1199 '../build/linux/system.gyp:openssl', 1199 '../third_party/openssl/openssl.gyp:openssl',
1200 ] 1200 ]
1201 }, { 1201 }, {
1202 'dependencies': [ 1202 'dependencies': [
1203 '../build/linux/system.gyp:nss', 1203 '../build/linux/system.gyp:nss',
1204 ], 1204 ],
1205 }], 1205 }],
1206 ], 1206 ],
1207 }], 1207 }],
1208 ['OS == "linux"', { 1208 ['OS == "linux"', {
1209 'conditions': [ 1209 'conditions': [
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
1449 ], 1449 ],
1450 }], 1450 }],
1451 ], 1451 ],
1452 } 1452 }
1453 1453
1454 # Local Variables: 1454 # Local Variables:
1455 # tab-width:2 1455 # tab-width:2
1456 # indent-tabs-mode:nil 1456 # indent-tabs-mode:nil
1457 # End: 1457 # End:
1458 # vim: set expandtab tabstop=2 shiftwidth=2: 1458 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/chrome_common.gypi ('k') | net/socket/ssl_client_socket_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698