| 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 import("//testing/test.gni") | 6 import("//testing/test.gni") |
| 7 | 7 |
| 8 if (is_nacl) { | 8 if (is_nacl) { |
| 9 component("crypto") { | 9 component("crypto") { |
| 10 output_name = "crcrypto" # Avoid colliding with OpenSSL's libcrypto. | 10 output_name = "crcrypto" # Avoid colliding with OpenSSL's libcrypto. |
| (...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 # used. The libssl target will add the search path we want, but | 358 # used. The libssl target will add the search path we want, but |
| 359 # according to GN's ordering rules, public_configs' search path will get | 359 # according to GN's ordering rules, public_configs' search path will get |
| 360 # applied before ones inherited from our dependencies. Therefore, we | 360 # applied before ones inherited from our dependencies. Therefore, we |
| 361 # need to explicitly list our custom libssl's config here before the | 361 # need to explicitly list our custom libssl's config here before the |
| 362 # system one. | 362 # system one. |
| 363 public_configs += [ "//net/third_party/nss/ssl:ssl_config" ] | 363 public_configs += [ "//net/third_party/nss/ssl:ssl_config" ] |
| 364 } | 364 } |
| 365 public_configs += [ "//third_party/nss:system_nss_no_ssl_config" ] | 365 public_configs += [ "//third_party/nss:system_nss_no_ssl_config" ] |
| 366 } else { | 366 } else { |
| 367 # Non-Linux platforms use the hermetic NSS from the tree. | 367 # Non-Linux platforms use the hermetic NSS from the tree. |
| 368 deps += [ | 368 public_deps = [ |
| 369 "//third_party/nss:nspr", | 369 "//third_party/nss:nspr", |
| 370 "//third_party/nss:nss", | 370 "//third_party/nss:nss", |
| 371 ] | 371 ] |
| 372 } | 372 } |
| 373 } | 373 } |
| 374 } | 374 } |
| OLD | NEW |