| 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/config/crypto.gni") | 5 import("//build/config/crypto.gni") |
| 6 | 6 |
| 7 component("crypto") { | 7 component("crypto") { |
| 8 output_name = "crcrypto" # Avoid colliding with OpenSSL's libcrypto. | 8 output_name = "crcrypto" # Avoid colliding with OpenSSL's libcrypto. |
| 9 sources = [ | 9 sources = [ |
| 10 "apple_keychain.h", | 10 "apple_keychain.h", |
| (...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 if (use_openssl) { | 278 if (use_openssl) { |
| 279 deps = [ "//third_party/boringssl" ] | 279 deps = [ "//third_party/boringssl" ] |
| 280 } else { | 280 } else { |
| 281 deps = [ "//net/third_party/nss/ssl:libssl" ] | 281 deps = [ "//net/third_party/nss/ssl:libssl" ] |
| 282 if (is_linux) { | 282 if (is_linux) { |
| 283 # On Linux, we use the system NSS (excepting SSL where we always use our | 283 # On Linux, we use the system NSS (excepting SSL where we always use our |
| 284 # own). | 284 # own). |
| 285 # | 285 # |
| 286 # We always need our SSL header search path to come before the system one | 286 # We always need our SSL header search path to come before the system one |
| 287 # so our versions are used. The libssl target will add the search path we | 287 # so our versions are used. The libssl target will add the search path we |
| 288 # want, but according to GN's ordering rules, direct_dependent_configs' | 288 # want, but according to GN's ordering rules, public_configs' search path |
| 289 # search path will get applied before ones inherited from our | 289 # will get applied before ones inherited from our dependencies. |
| 290 # dependencies. Therefore, we need to explicitly list our custom libssl's | 290 # Therefore, we need to explicitly list our custom libssl's config here |
| 291 # config here before the system one. | 291 # before the system one. |
| 292 direct_dependent_configs = [ | 292 public_configs = [ |
| 293 "//net/third_party/nss/ssl:ssl_config", | 293 "//net/third_party/nss/ssl:ssl_config", |
| 294 "//third_party/nss:system_nss_no_ssl_config", | 294 "//third_party/nss:system_nss_no_ssl_config", |
| 295 ] | 295 ] |
| 296 } else { | 296 } else { |
| 297 # Non-Linux platforms use the hermetic NSS from the tree. | 297 # Non-Linux platforms use the hermetic NSS from the tree. |
| 298 deps += [ | 298 deps += [ |
| 299 "//third_party/nss:nspr", | 299 "//third_party/nss:nspr", |
| 300 "//third_party/nss:nss", | 300 "//third_party/nss:nss", |
| 301 ] | 301 ] |
| 302 } | 302 } |
| 303 } | 303 } |
| 304 } | 304 } |
| OLD | NEW |