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

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

Issue 881213004: Support building BoringSSL with NSS certificates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 8 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
« no previous file with comments | « build/config/crypto.gni ('k') | chrome/chrome_common.gypi » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'conditions': [ 7 'conditions': [
8 ['sysroot!=""', { 8 ['sysroot!=""', {
9 'pkg-config': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target _arch)" "<(system_libdir)"', 9 'pkg-config': '<(chroot_cmd) ./pkg-config-wrapper "<(sysroot)" "<(target _arch)" "<(system_libdir)"',
10 }, { 10 }, {
(...skipping 1162 matching lines...) Expand 10 before | Expand all | Expand 10 after
1173 { 1173 {
1174 'target_name': 'ssl', 1174 'target_name': 'ssl',
1175 'type': 'none', 1175 'type': 'none',
1176 'conditions': [ 1176 'conditions': [
1177 ['_toolset=="target"', { 1177 ['_toolset=="target"', {
1178 'conditions': [ 1178 'conditions': [
1179 ['use_openssl==1', { 1179 ['use_openssl==1', {
1180 'dependencies': [ 1180 'dependencies': [
1181 '../../third_party/boringssl/boringssl.gyp:boringssl', 1181 '../../third_party/boringssl/boringssl.gyp:boringssl',
1182 ], 1182 ],
1183 }], 1183 }, {
1184 ['use_openssl==0', {
1185 'dependencies': [ 1184 'dependencies': [
1186 '../../net/third_party/nss/ssl.gyp:libssl', 1185 '../../net/third_party/nss/ssl.gyp:libssl',
1187 ], 1186 ],
1188 'direct_dependent_settings': { 1187 'direct_dependent_settings': {
1189 'include_dirs+': [ 1188 'include_dirs+': [
1190 # We need for our local copies of the libssl3 headers to come 1189 # We need for our local copies of the libssl3 headers to come
1191 # before other includes, as we are shadowing system headers. 1190 # before other includes, as we are shadowing system headers.
1192 '<(DEPTH)/net/third_party/nss/ssl', 1191 '<(DEPTH)/net/third_party/nss/ssl',
1193 ], 1192 ],
1193 },
1194 }],
1195 # Link in the system NSS if it is used for either the internal
1196 # crypto library (use_openssl==0) or platform certificate
1197 # library (use_nss_certs==1).
1198 ['use_openssl==0 or use_nss_certs==1', {
1199 'direct_dependent_settings': {
1194 'cflags': [ 1200 'cflags': [
1195 '<!@(<(pkg-config) --cflags nss)', 1201 '<!@(<(pkg-config) --cflags nss)',
1196 ], 1202 ],
1197 }, 1203 },
1198 'link_settings': { 1204 'link_settings': {
1199 'ldflags': [ 1205 'ldflags': [
1200 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)', 1206 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
1201 ], 1207 ],
1202 'libraries': [ 1208 'libraries': [
1203 '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")', 1209 '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
1204 ], 1210 ],
1205 }, 1211 },
1206 }], 1212 'conditions': [
1207 ['use_openssl==0 and clang==1', { 1213 ['clang==1', {
1208 'direct_dependent_settings': { 1214 'direct_dependent_settings': {
1209 'cflags': [ 1215 'cflags': [
1210 # There is a broken header guard in /usr/include/nss/secmod.h: 1216 # There is a broken header guard in /usr/include/nss/secmo d.h:
1211 # https://bugzilla.mozilla.org/show_bug.cgi?id=884072 1217 # https://bugzilla.mozilla.org/show_bug.cgi?id=884072
1212 '-Wno-header-guard', 1218 '-Wno-header-guard',
1213 ], 1219 ],
1214 }, 1220 },
1221 }],
1222 ],
1215 }], 1223 }],
1216 ] 1224 ]
1217 }], 1225 }],
1218 ], 1226 ],
1219 }, 1227 },
1220 ], 1228 ],
1221 } 1229 }
OLDNEW
« no previous file with comments | « build/config/crypto.gni ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698