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

Side by Side Diff: net/net.gyp

Issue 201673006: net/ compile fixes for for chromeos use_openssl=1 build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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 | Annotate | Revision Log
« no previous file with comments | « net/base/keygen_handler_unittest.cc ('k') | no next file » | 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 'use_tracing_cache_backend%': 0, 10 'use_tracing_cache_backend%': 0,
(...skipping 1363 matching lines...) Expand 10 before | Expand all | Expand 10 after
1374 'base/nss_memio.c', 1374 'base/nss_memio.c',
1375 'base/nss_memio.h', 1375 'base/nss_memio.h',
1376 'cert/cert_database_nss.cc', 1376 'cert/cert_database_nss.cc',
1377 'cert/cert_verify_proc_nss.cc', 1377 'cert/cert_verify_proc_nss.cc',
1378 'cert/cert_verify_proc_nss.h', 1378 'cert/cert_verify_proc_nss.h',
1379 'cert/ct_log_verifier_nss.cc', 1379 'cert/ct_log_verifier_nss.cc',
1380 'cert/ct_objects_extractor_nss.cc', 1380 'cert/ct_objects_extractor_nss.cc',
1381 'cert/jwk_serializer_nss.cc', 1381 'cert/jwk_serializer_nss.cc',
1382 'cert/nss_cert_database.cc', 1382 'cert/nss_cert_database.cc',
1383 'cert/nss_cert_database.h', 1383 'cert/nss_cert_database.h',
1384 'cert/nss_cert_database_chromeos.cc',
1385 'cert/nss_cert_database_chromeos.h',
1386 'cert/nss_profile_filter_chromeos.cc',
1387 'cert/nss_profile_filter_chromeos.h',
1384 'cert/scoped_nss_types.h', 1388 'cert/scoped_nss_types.h',
1385 'cert/test_root_certs_nss.cc', 1389 'cert/test_root_certs_nss.cc',
1386 'cert/x509_certificate_nss.cc', 1390 'cert/x509_certificate_nss.cc',
1387 'cert/x509_util_nss.cc', 1391 'cert/x509_util_nss.cc',
1388 'cert/x509_util_nss.h', 1392 'cert/x509_util_nss.h',
1389 'ocsp/nss_ocsp.cc', 1393 'ocsp/nss_ocsp.cc',
1390 'ocsp/nss_ocsp.h', 1394 'ocsp/nss_ocsp.h',
1391 'quic/crypto/aead_base_decrypter_nss.cc', 1395 'quic/crypto/aead_base_decrypter_nss.cc',
1392 'quic/crypto/aead_base_encrypter_nss.cc', 1396 'quic/crypto/aead_base_encrypter_nss.cc',
1393 'quic/crypto/aes_128_gcm_12_decrypter_nss.cc', 1397 'quic/crypto/aes_128_gcm_12_decrypter_nss.cc',
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
1512 'dependencies': [ 1516 'dependencies': [
1513 '../build/linux/system.gyp:gdk', 1517 '../build/linux/system.gyp:gdk',
1514 ], 1518 ],
1515 }], 1519 }],
1516 [ 'use_nss != 1', { 1520 [ 'use_nss != 1', {
1517 'sources!': [ 1521 'sources!': [
1518 'cert/cert_verify_proc_nss.cc', 1522 'cert/cert_verify_proc_nss.cc',
1519 'cert/cert_verify_proc_nss.h', 1523 'cert/cert_verify_proc_nss.h',
1520 'ssl/client_cert_store_nss.cc', 1524 'ssl/client_cert_store_nss.cc',
1521 'ssl/client_cert_store_nss.h', 1525 'ssl/client_cert_store_nss.h',
1526 'ssl/client_cert_store_chromeos.cc',
1527 'ssl/client_cert_store_chromeos.h',
1522 ], 1528 ],
1523 }], 1529 }],
1524 [ 'enable_websockets != 1', { 1530 [ 'enable_websockets != 1', {
1525 'sources/': [ 1531 'sources/': [
1526 ['exclude', '^socket_stream/'], 1532 ['exclude', '^socket_stream/'],
1527 ['exclude', '^websockets/'], 1533 ['exclude', '^websockets/'],
1528 ], 1534 ],
1529 'sources!': [ 1535 'sources!': [
1530 'spdy/spdy_websocket_stream.cc', 1536 'spdy/spdy_websocket_stream.cc',
1531 'spdy/spdy_websocket_stream.h', 1537 'spdy/spdy_websocket_stream.h',
(...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after
2192 'dns/dns_config_service_posix_unittest.cc', 2198 'dns/dns_config_service_posix_unittest.cc',
2193 ], 2199 ],
2194 'dependencies': [ 2200 'dependencies': [
2195 'net_javatests', 2201 'net_javatests',
2196 'net_test_jni_headers', 2202 'net_test_jni_headers',
2197 ], 2203 ],
2198 }], 2204 }],
2199 [ 'use_nss != 1', { 2205 [ 'use_nss != 1', {
2200 'sources!': [ 2206 'sources!': [
2201 'ssl/client_cert_store_nss_unittest.cc', 2207 'ssl/client_cert_store_nss_unittest.cc',
2208 'ssl/client_cert_store_chromeos_unittest.cc',
2202 ], 2209 ],
2203 }], 2210 }],
2204 [ 'use_openssl == 1', { 2211 [ 'use_openssl == 1', {
2205 # Avoid compiling/linking with the system library. 2212 # Avoid compiling/linking with the system library.
2206 'dependencies': [ 2213 'dependencies': [
2207 '../third_party/openssl/openssl.gyp:openssl', 2214 '../third_party/openssl/openssl.gyp:openssl',
2208 ], 2215 ],
2209 }, { # use_openssl == 0 2216 }, { # use_openssl == 0
2210 'conditions': [ 2217 'conditions': [
2211 [ 'desktop_linux == 1 or chromeos == 1', { 2218 [ 'desktop_linux == 1 or chromeos == 1', {
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
2256 }], 2263 }],
2257 [ 'use_openssl==1', { 2264 [ 'use_openssl==1', {
2258 # When building for OpenSSL, we need to exclude NSS specific tests 2265 # When building for OpenSSL, we need to exclude NSS specific tests
2259 # or functionality not supported by OpenSSL yet. 2266 # or functionality not supported by OpenSSL yet.
2260 # TODO(bulach): Add equivalent tests when the underlying 2267 # TODO(bulach): Add equivalent tests when the underlying
2261 # functionality is ported to OpenSSL. 2268 # functionality is ported to OpenSSL.
2262 'sources!': [ 2269 'sources!': [
2263 'cert/ct_objects_extractor_unittest.cc', 2270 'cert/ct_objects_extractor_unittest.cc',
2264 'cert/multi_log_ct_verifier_unittest.cc', 2271 'cert/multi_log_ct_verifier_unittest.cc',
2265 'cert/nss_cert_database_unittest.cc', 2272 'cert/nss_cert_database_unittest.cc',
2273 'cert/nss_cert_database_chromeos_unittest.cc',
2274 'cert/nss_profile_filter_chromeos_unittest.cc',
2266 'cert/x509_util_nss_unittest.cc', 2275 'cert/x509_util_nss_unittest.cc',
2267 'quic/test_tools/crypto_test_utils_nss.cc', 2276 'quic/test_tools/crypto_test_utils_nss.cc',
2268 ], 2277 ],
2269 }, { # else !use_openssl: remove the unneeded files 2278 }, { # else !use_openssl: remove the unneeded files
2270 'sources!': [ 2279 'sources!': [
2271 'cert/x509_util_openssl_unittest.cc', 2280 'cert/x509_util_openssl_unittest.cc',
2272 'quic/test_tools/crypto_test_utils_openssl.cc', 2281 'quic/test_tools/crypto_test_utils_openssl.cc',
2273 'socket/ssl_client_socket_openssl_unittest.cc', 2282 'socket/ssl_client_socket_openssl_unittest.cc',
2274 'socket/ssl_session_cache_openssl_unittest.cc', 2283 'socket/ssl_session_cache_openssl_unittest.cc',
2275 ], 2284 ],
(...skipping 1133 matching lines...) Expand 10 before | Expand all | Expand 10 after
3409 'java_in_dir': 'cronet/android/sample/javatests', 3418 'java_in_dir': 'cronet/android/sample/javatests',
3410 'resource_dir': 'cronet/android/sample/res', 3419 'resource_dir': 'cronet/android/sample/res',
3411 'is_test_apk': 1, 3420 'is_test_apk': 1,
3412 }, 3421 },
3413 'includes': [ '../build/java_apk.gypi' ], 3422 'includes': [ '../build/java_apk.gypi' ],
3414 }, 3423 },
3415 ], 3424 ],
3416 }], # OS=="android" 3425 }], # OS=="android"
3417 ], 3426 ],
3418 } 3427 }
OLDNEW
« no previous file with comments | « net/base/keygen_handler_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698