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

Side by Side Diff: net/net.gyp

Issue 1304143010: Plumbing SSLPrivateKey Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix rebase. Created 4 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
« no previous file with comments | « net/cert/cert_database_android.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 'linux_link_kerberos%': 0, 8 'linux_link_kerberos%': 0,
9 # Enables BidirectionalStream; Used in cronet, disabled by default. 9 # Enables BidirectionalStream; Used in cronet, disabled by default.
10 'enable_bidirectional_stream%': 0, 10 'enable_bidirectional_stream%': 0,
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 'sources!': [ 261 'sources!': [
262 'quic/test_tools/crypto_test_utils_nss.cc', 262 'quic/test_tools/crypto_test_utils_nss.cc',
263 ], 263 ],
264 }, { # else !use_openssl: remove the unneeded files and pull in NSS. 264 }, { # else !use_openssl: remove the unneeded files and pull in NSS.
265 'sources!': [ 265 'sources!': [
266 'quic/test_tools/crypto_test_utils_openssl.cc', 266 'quic/test_tools/crypto_test_utils_openssl.cc',
267 'ssl/ssl_client_session_cache_openssl_unittest.cc', 267 'ssl/ssl_client_session_cache_openssl_unittest.cc',
268 ], 268 ],
269 }, 269 },
270 ], 270 ],
271 [ 'use_openssl_certs == 0', {
272 'sources!': [
273 'ssl/openssl_client_key_store_unittest.cc',
274 ],
275 }],
276 [ 'enable_websockets != 1', { 271 [ 'enable_websockets != 1', {
277 'sources/': [ 272 'sources/': [
278 ['exclude', '^websockets/'], 273 ['exclude', '^websockets/'],
279 ['exclude', '^server/'], 274 ['exclude', '^server/'],
280 ], 275 ],
281 'dependencies!': [ 276 'dependencies!': [
282 'http_server', 277 'http_server',
283 ], 278 ],
284 }], 279 }],
285 ['disable_file_support==1', { 280 ['disable_file_support==1', {
(...skipping 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after
1718 '../build/isolate.gypi', 1713 '../build/isolate.gypi',
1719 ], 1714 ],
1720 'sources': [ 1715 'sources': [
1721 'net_unittests.isolate', 1716 'net_unittests.isolate',
1722 ], 1717 ],
1723 }, 1718 },
1724 ], 1719 ],
1725 }], 1720 }],
1726 ], 1721 ],
1727 } 1722 }
OLDNEW
« no previous file with comments | « net/cert/cert_database_android.cc ('k') | net/net.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698