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

Side by Side Diff: net/net.gyp

Issue 1304143010: Plumbing SSLPrivateKey Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing unused function in Android. Created 5 years, 2 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 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 'conditions': [ 9 'conditions': [
10 ['chromeos==1 or embedded==1 or OS=="ios"', { 10 ['chromeos==1 or embedded==1 or OS=="ios"', {
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 ], 251 ],
252 }, { # else !use_openssl: remove the unneeded files and pull in NSS. 252 }, { # else !use_openssl: remove the unneeded files and pull in NSS.
253 'sources!': [ 253 'sources!': [
254 'cert/x509_util_openssl_unittest.cc', 254 'cert/x509_util_openssl_unittest.cc',
255 'quic/test_tools/crypto_test_utils_openssl.cc', 255 'quic/test_tools/crypto_test_utils_openssl.cc',
256 'socket/ssl_client_socket_openssl_unittest.cc', 256 'socket/ssl_client_socket_openssl_unittest.cc',
257 'ssl/ssl_client_session_cache_openssl_unittest.cc', 257 'ssl/ssl_client_session_cache_openssl_unittest.cc',
258 ], 258 ],
259 }, 259 },
260 ], 260 ],
261 [ 'use_openssl_certs == 0', {
262 'sources!': [
263 'ssl/openssl_client_key_store_unittest.cc',
264 ],
265 }],
266 [ 'enable_websockets != 1', { 261 [ 'enable_websockets != 1', {
267 'sources/': [ 262 'sources/': [
268 ['exclude', '^websockets/'], 263 ['exclude', '^websockets/'],
269 ['exclude', '^server/'], 264 ['exclude', '^server/'],
270 ], 265 ],
271 'dependencies!': [ 266 'dependencies!': [
272 'http_server', 267 'http_server',
273 ], 268 ],
274 }], 269 }],
275 ['disable_file_support==1', { 270 ['disable_file_support==1', {
(...skipping 1318 matching lines...) Expand 10 before | Expand all | Expand 10 after
1594 '../build/isolate.gypi', 1589 '../build/isolate.gypi',
1595 ], 1590 ],
1596 'sources': [ 1591 'sources': [
1597 'net_unittests.isolate', 1592 'net_unittests.isolate',
1598 ], 1593 ],
1599 }, 1594 },
1600 ], 1595 ],
1601 }], 1596 }],
1602 ], 1597 ],
1603 } 1598 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698