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

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: slightly tidier (edit: looks like this'll need a rebase later for try jobs to run.) Created 5 years, 10 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
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 1137 matching lines...) Expand 10 before | Expand all | Expand 10 after
1148 { 1148 {
1149 'target_name': 'ssl', 1149 'target_name': 'ssl',
1150 'type': 'none', 1150 'type': 'none',
1151 'conditions': [ 1151 'conditions': [
1152 ['_toolset=="target"', { 1152 ['_toolset=="target"', {
1153 'conditions': [ 1153 'conditions': [
1154 ['use_openssl==1', { 1154 ['use_openssl==1', {
1155 'dependencies': [ 1155 'dependencies': [
1156 '../../third_party/boringssl/boringssl.gyp:boringssl', 1156 '../../third_party/boringssl/boringssl.gyp:boringssl',
1157 ], 1157 ],
1158 }], 1158 }, {
1159 ['use_openssl==0', {
1160 'dependencies': [ 1159 'dependencies': [
1161 '../../net/third_party/nss/ssl.gyp:libssl', 1160 '../../net/third_party/nss/ssl.gyp:libssl',
1162 ], 1161 ],
1163 'direct_dependent_settings': { 1162 'direct_dependent_settings': {
1164 'include_dirs+': [ 1163 'include_dirs+': [
1165 # We need for our local copies of the libssl3 headers to come 1164 # We need for our local copies of the libssl3 headers to come
1166 # before other includes, as we are shadowing system headers. 1165 # before other includes, as we are shadowing system headers.
1167 '<(DEPTH)/net/third_party/nss/ssl', 1166 '<(DEPTH)/net/third_party/nss/ssl',
1168 ], 1167 ],
1168 },
1169 }],
1170 # Link in the system NSS if it is used for either the internal
1171 # crypto library (use_openssl==0) or platform certificate
1172 # library (use_nss==1).
1173 ['use_openssl==0 or use_nss==1', {
1174 'direct_dependent_settings': {
1169 'cflags': [ 1175 'cflags': [
1170 '<!@(<(pkg-config) --cflags nss)', 1176 '<!@(<(pkg-config) --cflags nss)',
1171 ], 1177 ],
1172 }, 1178 },
1173 'link_settings': { 1179 'link_settings': {
1174 'ldflags': [ 1180 'ldflags': [
1175 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)', 1181 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
1176 ], 1182 ],
1177 'libraries': [ 1183 'libraries': [
1178 '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")', 1184 '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
1179 ], 1185 ],
1180 }, 1186 },
1181 }], 1187 'conditions': [
1182 ['use_openssl==0 and clang==1', { 1188 ['clang==1', {
1183 'direct_dependent_settings': { 1189 'direct_dependent_settings': {
1184 'cflags': [ 1190 'cflags': [
1185 # There is a broken header guard in /usr/include/nss/secmod.h: 1191 # There is a broken header guard in /usr/include/nss/secmo d.h:
1186 # https://bugzilla.mozilla.org/show_bug.cgi?id=884072 1192 # https://bugzilla.mozilla.org/show_bug.cgi?id=884072
1187 '-Wno-header-guard', 1193 '-Wno-header-guard',
1188 ], 1194 ],
1189 }, 1195 },
1196 }],
1197 ],
1190 }], 1198 }],
1191 ] 1199 ]
1192 }], 1200 }],
1193 ], 1201 ],
1194 }, 1202 },
1195 ], 1203 ],
1196 } 1204 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698