| Index: net/BUILD.gn
|
| diff --git a/net/BUILD.gn b/net/BUILD.gn
|
| index dc19b1308d12658817d1dbc4cc4664a78c2ef781..5882613614bd9a51fddc1a0e6c04137d1819e597 100644
|
| --- a/net/BUILD.gn
|
| +++ b/net/BUILD.gn
|
| @@ -327,6 +327,12 @@ if (!is_nacl) {
|
| "cert/cert_verify_proc_ios.h",
|
| "cert/x509_certificate_openssl_ios.cc",
|
| ]
|
| +
|
| + net_shared_deps += [
|
| + "//third_party/nss:nspr",
|
| + "//third_party/nss",
|
| + "//net/third_party/nss/ssl:libssl",
|
| + ]
|
| }
|
|
|
| if (is_chromecast && use_nss_certs) {
|
| @@ -378,15 +384,11 @@ if (!is_nacl) {
|
| ]
|
|
|
| net_shared_sources -= [ "disk_cache/blockfile/file_posix.cc" ]
|
| - net_shared_deps += [
|
| - "//third_party/nss:nspr",
|
| - "//third_party/nss",
|
| - "//net/third_party/nss/ssl:libssl",
|
| - ]
|
| }
|
|
|
| if (is_ios && !use_nss_verifier) {
|
| - net_shared_sources += [ "cert/test_root_certs_mac.cc" ]
|
| + net_shared_unfiltered_sources += [ "cert/test_root_certs_mac.cc" ]
|
| + net_shared_sources -= [ "cert/x509_certificate_ios.cc" ]
|
| }
|
|
|
| if (is_ios || is_mac) {
|
| @@ -1435,6 +1437,8 @@ bundle_data("net_unittests_bundle_data") {
|
| "data/url_request_unittest",
|
| "data/verify_certificate_chain_unittest",
|
| "data/verify_name_match_unittest/names",
|
| + "third_party/nist-pkits/certs",
|
| + "third_party/nist-pkits/crls",
|
| ]
|
| outputs = [
|
| "{{bundle_resources_dir}}/" +
|
| @@ -1480,7 +1484,7 @@ test("net_unittests") {
|
| ]
|
| data_deps = []
|
|
|
| - if (!is_ios) {
|
| + if (use_openssl) {
|
| data_deps += [ "third_party/nist-pkits/" ]
|
| }
|
|
|
|
|