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

Side by Side Diff: net/net.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 | « net/cert/x509_util_nss_certs.cc ('k') | net/net.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 # See bug http://crbug.com/344533. 173 # See bug http://crbug.com/344533.
174 'disk_cache/blockfile/index_table_v3_unittest.cc', 174 'disk_cache/blockfile/index_table_v3_unittest.cc',
175 ], 175 ],
176 'dependencies': [ 176 'dependencies': [
177 'net_javatests', 177 'net_javatests',
178 'net_test_jni_headers', 178 'net_test_jni_headers',
179 ], 179 ],
180 }], 180 }],
181 [ 'use_nss_certs != 1', { 181 [ 'use_nss_certs != 1', {
182 'sources!': [ 182 'sources!': [
183 'cert/nss_cert_database_unittest.cc',
184 'cert/nss_cert_database_chromeos_unittest.cc',
185 'cert/nss_profile_filter_chromeos_unittest.cc',
183 'ssl/client_cert_store_chromeos_unittest.cc', 186 'ssl/client_cert_store_chromeos_unittest.cc',
184 'ssl/client_cert_store_nss_unittest.cc', 187 'ssl/client_cert_store_nss_unittest.cc',
185 ], 188 ],
186 }], 189 }],
187 [ 'use_openssl == 1', { 190 [ 'use_openssl == 1', {
188 # Avoid compiling/linking with the system library. 191 # Avoid compiling/linking with the system library.
189 'dependencies': [ 192 'dependencies': [
190 '../third_party/boringssl/boringssl.gyp:boringssl', 193 '../third_party/boringssl/boringssl.gyp:boringssl',
191 ], 194 ],
192 }, { # use_openssl == 0 195 }],
196 [ 'use_nss_certs == 1 or OS == "ios" or use_openssl == 0', {
193 'conditions': [ 197 'conditions': [
194 [ 'desktop_linux == 1 or chromeos == 1', { 198 [ 'desktop_linux == 1 or chromeos == 1', {
195 'dependencies': [ 199 'dependencies': [
196 '../build/linux/system.gyp:ssl', 200 '../build/linux/system.gyp:ssl',
197 ], 201 ],
198 }, { # desktop_linux == 0 and chromeos == 0 202 }, { # desktop_linux == 0 and chromeos == 0
199 'dependencies': [ 203 'dependencies': [
200 '../third_party/nss/nss.gyp:nspr', 204 '../third_party/nss/nss.gyp:nspr',
201 '../third_party/nss/nss.gyp:nss', 205 '../third_party/nss/nss.gyp:nss',
202 'third_party/nss/ssl.gyp:libssl', 206 'third_party/nss/ssl.gyp:libssl',
203 ], 207 ],
204 'sources!': [
205 'cert/nss_cert_database_unittest.cc',
206 ],
207 }], 208 }],
208 ], 209 ],
209 }], 210 }],
210 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { 211 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', {
211 'conditions': [ 212 'conditions': [
212 ['use_allocator!="none"', { 213 ['use_allocator!="none"', {
213 'dependencies': [ 214 'dependencies': [
214 '../base/allocator/allocator.gyp:allocator', 215 '../base/allocator/allocator.gyp:allocator',
215 ], 216 ],
216 }], 217 }],
(...skipping 17 matching lines...) Expand all
234 'sources!': [ 235 'sources!': [
235 'cert_net/nss_ocsp_unittest.cc', 236 'cert_net/nss_ocsp_unittest.cc',
236 ], 237 ],
237 }], 238 }],
238 [ 'use_openssl==1', { 239 [ 'use_openssl==1', {
239 # When building for OpenSSL, we need to exclude NSS specific tests 240 # When building for OpenSSL, we need to exclude NSS specific tests
240 # or functionality not supported by OpenSSL yet. 241 # or functionality not supported by OpenSSL yet.
241 # TODO(bulach): Add equivalent tests when the underlying 242 # TODO(bulach): Add equivalent tests when the underlying
242 # functionality is ported to OpenSSL. 243 # functionality is ported to OpenSSL.
243 'sources!': [ 244 'sources!': [
244 'cert/nss_cert_database_chromeos_unittest.cc',
245 'cert/nss_cert_database_unittest.cc',
246 'cert/nss_profile_filter_chromeos_unittest.cc',
247 'cert/x509_util_nss_unittest.cc', 245 'cert/x509_util_nss_unittest.cc',
248 'quic/test_tools/crypto_test_utils_nss.cc', 246 'quic/test_tools/crypto_test_utils_nss.cc',
249 ], 247 ],
250 }, { # else !use_openssl: remove the unneeded files and pull in NSS. 248 }, { # else !use_openssl: remove the unneeded files and pull in NSS.
251 'sources!': [ 249 'sources!': [
252 'cert/x509_util_openssl_unittest.cc', 250 'cert/x509_util_openssl_unittest.cc',
253 'quic/test_tools/crypto_test_utils_openssl.cc', 251 'quic/test_tools/crypto_test_utils_openssl.cc',
254 'socket/ssl_client_socket_openssl_unittest.cc', 252 'socket/ssl_client_socket_openssl_unittest.cc',
255 'ssl/ssl_client_session_cache_openssl_unittest.cc', 253 'ssl/ssl_client_session_cache_openssl_unittest.cc',
256 ], 254 ],
(...skipping 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after
1529 '../build/isolate.gypi', 1527 '../build/isolate.gypi',
1530 ], 1528 ],
1531 'sources': [ 1529 'sources': [
1532 'net_unittests.isolate', 1530 'net_unittests.isolate',
1533 ], 1531 ],
1534 }, 1532 },
1535 ], 1533 ],
1536 }], 1534 }],
1537 ], 1535 ],
1538 } 1536 }
OLDNEW
« no previous file with comments | « net/cert/x509_util_nss_certs.cc ('k') | net/net.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698