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

Side by Side Diff: build/linux/system.gyp

Issue 8907043: net: rename NSS's 'ssl' to 'libssl' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | « no previous file | net/net.gyp » ('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) 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 'conditions': [ 6 'conditions': [
7 ['sysroot!=""', { 7 ['sysroot!=""', {
8 'variables': { 8 'variables': {
9 'pkg-config': './pkg-config-wrapper "<(sysroot)"', 9 'pkg-config': './pkg-config-wrapper "<(sysroot)"',
10 }, 10 },
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 'conditions': [ 96 'conditions': [
97 ['_toolset=="target"', { 97 ['_toolset=="target"', {
98 'conditions': [ 98 'conditions': [
99 ['use_openssl==1', { 99 ['use_openssl==1', {
100 'dependencies': [ 100 'dependencies': [
101 '../../third_party/openssl/openssl.gyp:openssl', 101 '../../third_party/openssl/openssl.gyp:openssl',
102 ], 102 ],
103 }], 103 }],
104 ['use_openssl==0 and use_system_ssl==0', { 104 ['use_openssl==0 and use_system_ssl==0', {
105 'dependencies': [ 105 'dependencies': [
106 '../../net/third_party/nss/ssl.gyp:ssl', 106 '../../net/third_party/nss/ssl.gyp:libssl',
107 '../../third_party/zlib/zlib.gyp:zlib', 107 '../../third_party/zlib/zlib.gyp:zlib',
108 ], 108 ],
109 'direct_dependent_settings': { 109 'direct_dependent_settings': {
110 'include_dirs+': [ 110 'include_dirs+': [
111 # We need for our local copies of the libssl3 headers to come 111 # We need for our local copies of the libssl3 headers to come
112 # before other includes, as we are shadowing system headers. 112 # before other includes, as we are shadowing system headers.
113 '<(DEPTH)/net/third_party/nss/ssl', 113 '<(DEPTH)/net/third_party/nss/ssl',
114 ], 114 ],
115 'cflags': [ 115 'cflags': [
116 '<!@(<(pkg-config) --cflags nss)', 116 '<!@(<(pkg-config) --cflags nss)',
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
620 ], 620 ],
621 'libraries': [ 621 'libraries': [
622 '<!@(<(pkg-config) --libs-only-l wayland-client wayland-egl xkbcom mon)', 622 '<!@(<(pkg-config) --libs-only-l wayland-client wayland-egl xkbcom mon)',
623 ], 623 ],
624 }, 624 },
625 }], 625 }],
626 ], 626 ],
627 }, 627 },
628 ], 628 ],
629 } 629 }
OLDNEW
« no previous file with comments | « no previous file | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698