Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 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 import("//build/buildflag_header.gni") | 5 import("//build/buildflag_header.gni") |
| 6 import("//build/config/chromecast_build.gni") | 6 import("//build/config/chromecast_build.gni") |
| 7 import("//build/config/compiler/compiler.gni") | 7 import("//build/config/compiler/compiler.gni") |
| 8 import("//build/config/crypto.gni") | 8 import("//build/config/crypto.gni") |
| 9 import("//build/config/features.gni") | 9 import("//build/config/features.gni") |
| 10 import("//build/config/ui.gni") | 10 import("//build/config/ui.gni") |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 313 net_shared_sources -= [ | 313 net_shared_sources -= [ |
| 314 "cert/cert_verify_proc_nss.cc", | 314 "cert/cert_verify_proc_nss.cc", |
| 315 "cert/cert_verify_proc_nss.h", | 315 "cert/cert_verify_proc_nss.h", |
| 316 "cert/test_root_certs_nss.cc", | 316 "cert/test_root_certs_nss.cc", |
| 317 "cert/x509_util_nss_certs.cc", | 317 "cert/x509_util_nss_certs.cc", |
| 318 "cert_net/nss_ocsp.cc", | 318 "cert_net/nss_ocsp.cc", |
| 319 "cert_net/nss_ocsp.h", | 319 "cert_net/nss_ocsp.h", |
| 320 ] | 320 ] |
| 321 } | 321 } |
| 322 | 322 |
| 323 if (is_ios && use_nss_verifier) { | |
| 324 net_shared_sources -= [ | |
| 325 "cert/cert_verify_proc_ios.cc", | |
| 326 "cert/cert_verify_proc_ios.h", | |
| 327 "cert/x509_certificate_openssl_ios.cc", | |
| 328 ] | |
| 329 } | |
| 330 | |
| 323 if (is_chromecast && use_nss_certs) { | 331 if (is_chromecast && use_nss_certs) { |
| 324 net_shared_sources += [ "ssl/ssl_platform_key_chromecast.cc" ] | 332 net_shared_sources += [ "ssl/ssl_platform_key_chromecast.cc" ] |
| 325 net_shared_sources -= [ "ssl/ssl_platform_key_nss.cc" ] | 333 net_shared_sources -= [ "ssl/ssl_platform_key_nss.cc" ] |
| 326 } | 334 } |
| 327 | 335 |
| 328 if (!enable_mdns) { | 336 if (!enable_mdns) { |
| 329 net_shared_sources -= [ | 337 net_shared_sources -= [ |
| 330 "dns/mdns_cache.cc", | 338 "dns/mdns_cache.cc", |
| 331 "dns/mdns_cache.h", | 339 "dns/mdns_cache.h", |
| 332 "dns/mdns_client.cc", | 340 "dns/mdns_client.cc", |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 369 ] | 377 ] |
| 370 | 378 |
| 371 net_shared_sources -= [ "disk_cache/blockfile/file_posix.cc" ] | 379 net_shared_sources -= [ "disk_cache/blockfile/file_posix.cc" ] |
| 372 net_shared_deps += [ | 380 net_shared_deps += [ |
| 373 "//third_party/nss:nspr", | 381 "//third_party/nss:nspr", |
| 374 "//third_party/nss", | 382 "//third_party/nss", |
| 375 "//net/third_party/nss/ssl:libssl", | 383 "//net/third_party/nss/ssl:libssl", |
| 376 ] | 384 ] |
| 377 } | 385 } |
| 378 | 386 |
| 387 if (is_ios && !use_nss_verifier) { | |
| 388 net_shared_sources += [ "cert/test_root_certs_mac.cc" ] | |
| 389 } | |
| 390 | |
| 379 if (is_ios || is_mac) { | 391 if (is_ios || is_mac) { |
| 380 net_shared_sources += gypi_values.net_base_mac_ios_sources | 392 net_shared_sources += gypi_values.net_base_mac_ios_sources |
| 381 } | 393 } |
| 382 | 394 |
| 383 if (is_android) { | 395 if (is_android) { |
| 384 net_shared_deps += [ ":net_jni_headers" ] | 396 net_shared_deps += [ ":net_jni_headers" ] |
| 385 | 397 |
| 386 # Add some Linux sources that were excluded by the filter, but which | 398 # Add some Linux sources that were excluded by the filter, but which |
| 387 # are needed. | 399 # are needed. |
| 388 net_shared_unfiltered_sources += [ | 400 net_shared_unfiltered_sources += [ |
| (...skipping 985 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1374 | 1386 |
| 1375 bundle_data("net_unittests_bundle_data") { | 1387 bundle_data("net_unittests_bundle_data") { |
| 1376 testonly = true | 1388 testonly = true |
| 1377 sources = [ | 1389 sources = [ |
| 1378 "data/certificate_policies_unittest", | 1390 "data/certificate_policies_unittest", |
| 1379 "data/name_constraints_unittest", | 1391 "data/name_constraints_unittest", |
| 1380 "data/parse_certificate_unittest", | 1392 "data/parse_certificate_unittest", |
| 1381 "data/test.html", | 1393 "data/test.html", |
| 1382 "data/url_request_unittest", | 1394 "data/url_request_unittest", |
| 1383 "data/verify_certificate_chain_unittest", | 1395 "data/verify_certificate_chain_unittest", |
| 1384 "data/verify_name_match_unittest/names", | 1396 "data/verify_name_match_unittest/names", |
|
sdefresne
2016/03/25 21:46:36
You need to add the following here too if you want
svaldez
2016/03/28 14:19:49
Will fix that as well when re-adding the nist-pkit
| |
| 1385 ] | 1397 ] |
| 1386 outputs = [ | 1398 outputs = [ |
| 1387 "{{bundle_resources_dir}}/" + | 1399 "{{bundle_resources_dir}}/" + |
| 1388 "{{source_root_relative_dir}}/{{source_file_part}}", | 1400 "{{source_root_relative_dir}}/{{source_file_part}}", |
| 1389 ] | 1401 ] |
| 1390 } | 1402 } |
| 1391 | 1403 |
| 1392 test("net_unittests") { | 1404 test("net_unittests") { |
| 1393 sources = gypi_values.net_test_sources | 1405 sources = gypi_values.net_test_sources |
| 1394 | 1406 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1429 "//testing/gtest", | 1441 "//testing/gtest", |
| 1430 "//third_party/zlib", | 1442 "//third_party/zlib", |
| 1431 "//url", | 1443 "//url", |
| 1432 ] | 1444 ] |
| 1433 | 1445 |
| 1434 data = [ | 1446 data = [ |
| 1435 "data/", | 1447 "data/", |
| 1436 ] | 1448 ] |
| 1437 data_deps = [] | 1449 data_deps = [] |
| 1438 | 1450 |
| 1439 if (!is_ios) { | 1451 if (use_openssl) { |
| 1440 data_deps += [ "third_party/nist-pkits/" ] | 1452 data_deps += [ "third_party/nist-pkits/" ] |
| 1441 } | 1453 } |
| 1442 | 1454 |
| 1443 if (is_linux || is_mac || is_win) { | 1455 if (is_linux || is_mac || is_win) { |
| 1444 deps += [ | 1456 deps += [ |
| 1445 "//third_party/pyftpdlib/", | 1457 "//third_party/pyftpdlib/", |
| 1446 "//third_party/pywebsocket/", | 1458 "//third_party/pywebsocket/", |
| 1447 "//third_party/tlslite/", | 1459 "//third_party/tlslite/", |
| 1448 ] | 1460 ] |
| 1449 data_deps += [ | 1461 data_deps += [ |
| (...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1916 fuzzer_test("net_quic_crypto_framer_parse_message_fuzzer") { | 1928 fuzzer_test("net_quic_crypto_framer_parse_message_fuzzer") { |
| 1917 sources = [ | 1929 sources = [ |
| 1918 "quic/quic_crypto_framer_parse_message_fuzzer.cc", | 1930 "quic/quic_crypto_framer_parse_message_fuzzer.cc", |
| 1919 ] | 1931 ] |
| 1920 deps = [ | 1932 deps = [ |
| 1921 ":net_fuzzer_test_support", | 1933 ":net_fuzzer_test_support", |
| 1922 "//base", | 1934 "//base", |
| 1923 "//net", | 1935 "//net", |
| 1924 ] | 1936 ] |
| 1925 } | 1937 } |
| OLD | NEW |