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

Side by Side Diff: net/BUILD.gn

Issue 1871043003: Fixing BoringSSL on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adding simulator fix. Created 4 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
OLDNEW
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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 "cert_net/nss_ocsp.h", 320 "cert_net/nss_ocsp.h",
321 ] 321 ]
322 } 322 }
323 323
324 if (is_ios && use_nss_verifier) { 324 if (is_ios && use_nss_verifier) {
325 net_shared_sources -= [ 325 net_shared_sources -= [
326 "cert/cert_verify_proc_ios.cc", 326 "cert/cert_verify_proc_ios.cc",
327 "cert/cert_verify_proc_ios.h", 327 "cert/cert_verify_proc_ios.h",
328 "cert/x509_certificate_openssl_ios.cc", 328 "cert/x509_certificate_openssl_ios.cc",
329 ] 329 ]
330
331 net_shared_deps += [
332 "//third_party/nss:nspr",
333 "//third_party/nss",
334 "//net/third_party/nss/ssl:libssl",
335 ]
330 } 336 }
331 337
332 if (is_chromecast && use_nss_certs) { 338 if (is_chromecast && use_nss_certs) {
333 net_shared_sources += [ "ssl/ssl_platform_key_chromecast.cc" ] 339 net_shared_sources += [ "ssl/ssl_platform_key_chromecast.cc" ]
334 net_shared_sources -= [ "ssl/ssl_platform_key_nss.cc" ] 340 net_shared_sources -= [ "ssl/ssl_platform_key_nss.cc" ]
335 } 341 }
336 342
337 if (!enable_mdns) { 343 if (!enable_mdns) {
338 net_shared_sources -= [ 344 net_shared_sources -= [
339 "dns/mdns_cache.cc", 345 "dns/mdns_cache.cc",
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 "base/network_change_notifier_mac.cc", 377 "base/network_change_notifier_mac.cc",
372 "base/network_config_watcher_mac.cc", 378 "base/network_config_watcher_mac.cc",
373 "base/network_interfaces_mac.cc", 379 "base/network_interfaces_mac.cc",
374 "base/network_interfaces_mac.h", 380 "base/network_interfaces_mac.h",
375 "base/platform_mime_util_mac.mm", 381 "base/platform_mime_util_mac.mm",
376 "proxy/proxy_resolver_mac.cc", 382 "proxy/proxy_resolver_mac.cc",
377 "proxy/proxy_server_mac.cc", 383 "proxy/proxy_server_mac.cc",
378 ] 384 ]
379 385
380 net_shared_sources -= [ "disk_cache/blockfile/file_posix.cc" ] 386 net_shared_sources -= [ "disk_cache/blockfile/file_posix.cc" ]
381 net_shared_deps += [
382 "//third_party/nss:nspr",
383 "//third_party/nss",
384 "//net/third_party/nss/ssl:libssl",
385 ]
386 } 387 }
387 388
388 if (is_ios && !use_nss_verifier) { 389 if (is_ios && !use_nss_verifier) {
389 net_shared_sources += [ "cert/test_root_certs_mac.cc" ] 390 net_shared_unfiltered_sources += [ "cert/test_root_certs_mac.cc" ]
391 net_shared_sources -= [ "cert/x509_certificate_ios.cc" ]
390 } 392 }
391 393
392 if (is_ios || is_mac) { 394 if (is_ios || is_mac) {
393 net_shared_sources += gypi_values.net_base_mac_ios_sources 395 net_shared_sources += gypi_values.net_base_mac_ios_sources
394 } 396 }
395 397
396 if (is_android) { 398 if (is_android) {
397 net_shared_deps += [ ":net_jni_headers" ] 399 net_shared_deps += [ ":net_jni_headers" ]
398 400
399 # Add some Linux sources that were excluded by the filter, but which 401 # Add some Linux sources that were excluded by the filter, but which
(...skipping 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after
1428 testonly = true 1430 testonly = true
1429 sources = [ 1431 sources = [
1430 "data/certificate_policies_unittest", 1432 "data/certificate_policies_unittest",
1431 "data/name_constraints_unittest", 1433 "data/name_constraints_unittest",
1432 "data/parse_certificate_unittest", 1434 "data/parse_certificate_unittest",
1433 "data/parse_ocsp_unittest", 1435 "data/parse_ocsp_unittest",
1434 "data/test.html", 1436 "data/test.html",
1435 "data/url_request_unittest", 1437 "data/url_request_unittest",
1436 "data/verify_certificate_chain_unittest", 1438 "data/verify_certificate_chain_unittest",
1437 "data/verify_name_match_unittest/names", 1439 "data/verify_name_match_unittest/names",
1440 "third_party/nist-pkits/certs",
1441 "third_party/nist-pkits/crls",
1438 ] 1442 ]
1439 outputs = [ 1443 outputs = [
1440 "{{bundle_resources_dir}}/" + 1444 "{{bundle_resources_dir}}/" +
1441 "{{source_root_relative_dir}}/{{source_file_part}}", 1445 "{{source_root_relative_dir}}/{{source_file_part}}",
1442 ] 1446 ]
1443 } 1447 }
1444 1448
1445 test("net_unittests") { 1449 test("net_unittests") {
1446 sources = gypi_values.net_test_sources 1450 sources = gypi_values.net_test_sources
1447 1451
(...skipping 25 matching lines...) Expand all
1473 "//testing/gtest", 1477 "//testing/gtest",
1474 "//third_party/zlib", 1478 "//third_party/zlib",
1475 "//url", 1479 "//url",
1476 ] 1480 ]
1477 1481
1478 data = [ 1482 data = [
1479 "data/", 1483 "data/",
1480 ] 1484 ]
1481 data_deps = [] 1485 data_deps = []
1482 1486
1483 if (!is_ios) { 1487 if (use_openssl) {
1484 data_deps += [ "third_party/nist-pkits/" ] 1488 data_deps += [ "third_party/nist-pkits/" ]
1485 } 1489 }
1486 1490
1487 if (is_linux || is_mac || is_win) { 1491 if (is_linux || is_mac || is_win) {
1488 deps += [ 1492 deps += [
1489 "//third_party/pyftpdlib/", 1493 "//third_party/pyftpdlib/",
1490 "//third_party/pywebsocket/", 1494 "//third_party/pywebsocket/",
1491 "//third_party/tlslite/", 1495 "//third_party/tlslite/",
1492 ] 1496 ]
1493 data_deps += [ 1497 data_deps += [
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
1950 fuzzer_test("net_quic_crypto_framer_parse_message_fuzzer") { 1954 fuzzer_test("net_quic_crypto_framer_parse_message_fuzzer") {
1951 sources = [ 1955 sources = [
1952 "quic/quic_crypto_framer_parse_message_fuzzer.cc", 1956 "quic/quic_crypto_framer_parse_message_fuzzer.cc",
1953 ] 1957 ]
1954 deps = [ 1958 deps = [
1955 ":net_fuzzer_test_support", 1959 ":net_fuzzer_test_support",
1956 "//base", 1960 "//base",
1957 "//net", 1961 "//net",
1958 ] 1962 ]
1959 } 1963 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698