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

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: Fix TARGET_IPHONE_SIMULATOR case. 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 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 "cert_net/nss_ocsp.h", 316 "cert_net/nss_ocsp.h",
317 ] 317 ]
318 } 318 }
319 319
320 if (is_ios && use_nss_verifier) { 320 if (is_ios && use_nss_verifier) {
321 net_shared_sources -= [ 321 net_shared_sources -= [
322 "cert/cert_verify_proc_ios.cc", 322 "cert/cert_verify_proc_ios.cc",
323 "cert/cert_verify_proc_ios.h", 323 "cert/cert_verify_proc_ios.h",
324 "cert/x509_certificate_openssl_ios.cc", 324 "cert/x509_certificate_openssl_ios.cc",
325 ] 325 ]
326
327 net_shared_deps += [
328 "//third_party/nss:nspr",
329 "//third_party/nss",
330 "//net/third_party/nss/ssl:libssl",
331 ]
326 } 332 }
327 333
328 if (is_chromecast && use_nss_certs) { 334 if (is_chromecast && use_nss_certs) {
329 net_shared_sources += [ "ssl/ssl_platform_key_chromecast.cc" ] 335 net_shared_sources += [ "ssl/ssl_platform_key_chromecast.cc" ]
330 net_shared_sources -= [ "ssl/ssl_platform_key_nss.cc" ] 336 net_shared_sources -= [ "ssl/ssl_platform_key_nss.cc" ]
331 } 337 }
332 338
333 if (!enable_mdns) { 339 if (!enable_mdns) {
334 net_shared_sources -= [ 340 net_shared_sources -= [
335 "dns/mdns_cache.cc", 341 "dns/mdns_cache.cc",
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 "base/network_change_notifier_mac.cc", 373 "base/network_change_notifier_mac.cc",
368 "base/network_config_watcher_mac.cc", 374 "base/network_config_watcher_mac.cc",
369 "base/network_interfaces_mac.cc", 375 "base/network_interfaces_mac.cc",
370 "base/network_interfaces_mac.h", 376 "base/network_interfaces_mac.h",
371 "base/platform_mime_util_mac.mm", 377 "base/platform_mime_util_mac.mm",
372 "proxy/proxy_resolver_mac.cc", 378 "proxy/proxy_resolver_mac.cc",
373 "proxy/proxy_server_mac.cc", 379 "proxy/proxy_server_mac.cc",
374 ] 380 ]
375 381
376 net_shared_sources -= [ "disk_cache/blockfile/file_posix.cc" ] 382 net_shared_sources -= [ "disk_cache/blockfile/file_posix.cc" ]
377 net_shared_deps += [
378 "//third_party/nss:nspr",
379 "//third_party/nss",
380 "//net/third_party/nss/ssl:libssl",
381 ]
382 } 383 }
383 384
384 if (is_ios && !use_nss_verifier) { 385 if (is_ios && !use_nss_verifier) {
385 net_shared_sources += [ "cert/test_root_certs_mac.cc" ] 386 net_shared_unfiltered_sources += [ "cert/test_root_certs_mac.cc" ]
387 net_shared_sources -= [ "cert/x509_certificate_ios.cc" ]
386 } 388 }
387 389
388 if (is_ios || is_mac) { 390 if (is_ios || is_mac) {
389 net_shared_sources += gypi_values.net_base_mac_ios_sources 391 net_shared_sources += gypi_values.net_base_mac_ios_sources
390 } 392 }
391 393
392 if (is_android) { 394 if (is_android) {
393 net_shared_deps += [ ":net_jni_headers" ] 395 net_shared_deps += [ ":net_jni_headers" ]
394 396
395 # Add some Linux sources that were excluded by the filter, but which 397 # Add some Linux sources that were excluded by the filter, but which
(...skipping 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after
1424 testonly = true 1426 testonly = true
1425 sources = [ 1427 sources = [
1426 "data/certificate_policies_unittest", 1428 "data/certificate_policies_unittest",
1427 "data/name_constraints_unittest", 1429 "data/name_constraints_unittest",
1428 "data/parse_certificate_unittest", 1430 "data/parse_certificate_unittest",
1429 "data/parse_ocsp_unittest", 1431 "data/parse_ocsp_unittest",
1430 "data/test.html", 1432 "data/test.html",
1431 "data/url_request_unittest", 1433 "data/url_request_unittest",
1432 "data/verify_certificate_chain_unittest", 1434 "data/verify_certificate_chain_unittest",
1433 "data/verify_name_match_unittest/names", 1435 "data/verify_name_match_unittest/names",
1436 "third_party/nist-pkits/certs",
1437 "third_party/nist-pkits/crls",
1434 ] 1438 ]
1435 outputs = [ 1439 outputs = [
1436 "{{bundle_resources_dir}}/" + 1440 "{{bundle_resources_dir}}/" +
1437 "{{source_root_relative_dir}}/{{source_file_part}}", 1441 "{{source_root_relative_dir}}/{{source_file_part}}",
1438 ] 1442 ]
1439 } 1443 }
1440 1444
1441 test("net_unittests") { 1445 test("net_unittests") {
1442 sources = gypi_values.net_test_sources 1446 sources = gypi_values.net_test_sources
1443 1447
(...skipping 25 matching lines...) Expand all
1469 "//testing/gtest", 1473 "//testing/gtest",
1470 "//third_party/zlib", 1474 "//third_party/zlib",
1471 "//url", 1475 "//url",
1472 ] 1476 ]
1473 1477
1474 data = [ 1478 data = [
1475 "data/", 1479 "data/",
1476 ] 1480 ]
1477 data_deps = [] 1481 data_deps = []
1478 1482
1479 if (!is_ios) { 1483 if (use_openssl) {
1480 data_deps += [ "third_party/nist-pkits/" ] 1484 data_deps += [ "third_party/nist-pkits/" ]
1481 } 1485 }
1482 1486
1483 if (is_linux || is_mac || is_win) { 1487 if (is_linux || is_mac || is_win) {
1484 deps += [ 1488 deps += [
1485 "//third_party/pyftpdlib/", 1489 "//third_party/pyftpdlib/",
1486 "//third_party/pywebsocket/", 1490 "//third_party/pywebsocket/",
1487 "//third_party/tlslite/", 1491 "//third_party/tlslite/",
1488 ] 1492 ]
1489 data_deps += [ 1493 data_deps += [
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
1946 fuzzer_test("net_quic_crypto_framer_parse_message_fuzzer") { 1950 fuzzer_test("net_quic_crypto_framer_parse_message_fuzzer") {
1947 sources = [ 1951 sources = [
1948 "quic/quic_crypto_framer_parse_message_fuzzer.cc", 1952 "quic/quic_crypto_framer_parse_message_fuzzer.cc",
1949 ] 1953 ]
1950 deps = [ 1954 deps = [
1951 ":net_fuzzer_test_support", 1955 ":net_fuzzer_test_support",
1952 "//base", 1956 "//base",
1953 "//net", 1957 "//net",
1954 ] 1958 ]
1955 } 1959 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698