Index: crypto/BUILD.gn |
diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn |
index 27e786ce85aef51f83c4e0f71feeaf6150f4a130..107252190f4e522e68276b685b0b0e4d609fc1e7 100644 |
--- a/crypto/BUILD.gn |
+++ b/crypto/BUILD.gn |
@@ -48,6 +48,8 @@ component("crypto") { |
"mock_apple_keychain.h", |
"mock_apple_keychain_ios.cc", |
"mock_apple_keychain_mac.cc", |
+ "nss_key_util.cc", |
+ "nss_key_util.h", |
"nss_util.cc", |
"nss_util.h", |
"nss_util_internal.h", |
@@ -167,10 +169,12 @@ component("crypto") { |
] |
} |
- # Remove nss_util when NSS is used for neither the internal crypto library |
- # nor the platform certificate library. |
+ # Some files are built when NSS is used at all, either for the internal crypto |
+ # library or the platform certificate library. |
if (use_openssl && !use_nss_certs) { |
sources -= [ |
+ "nss_key_util.cc", |
+ "nss_key_util.h", |
"nss_util.cc", |
"nss_util.h", |
"nss_util_internal.h", |
@@ -222,12 +226,12 @@ test("crypto_unittests") { |
"ghash_unittest.cc", |
"hkdf_unittest.cc", |
"hmac_unittest.cc", |
+ "nss_key_util_unittest.cc", |
"nss_util_unittest.cc", |
"openssl_bio_string_unittest.cc", |
"p224_spake_unittest.cc", |
"p224_unittest.cc", |
"random_unittest.cc", |
- "rsa_private_key_nss_unittest.cc", |
"rsa_private_key_unittest.cc", |
"secure_hash_unittest.cc", |
"sha2_unittest.cc", |
@@ -236,15 +240,16 @@ test("crypto_unittests") { |
"symmetric_key_unittest.cc", |
] |
- # Remove nss_util when NSS is used for neither the internal crypto library |
- # nor the platform certificate library. |
+ # Some files are built when NSS is used at all, either for the internal crypto |
+ # library or the platform certificate library. |
if (use_openssl && !use_nss_certs) { |
- sources -= [ "nss_util_unittest.cc" ] |
+ sources -= [ |
+ "nss_key_util_unittest.cc", |
+ "nss_util_unittest.cc", |
+ ] |
} |
- if (use_openssl) { |
- sources -= [ "rsa_private_key_nss_unittest.cc" ] |
- } else { |
+ if (!use_openssl) { |
sources -= [ "openssl_bio_string_unittest.cc" ] |
} |