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

Unified Diff: crypto/BUILD.gn

Issue 239543013: Work on Mac GN build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix line endings Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/toolchain/win/BUILD.gn ('k') | net/BUILD.gn » ('j') | skia/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/BUILD.gn
diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn
index 455169c2f2e08f5255703cf417f2aba964e6e198..1f31f8b09894934cc4f1d3633cb405e1abd892bd 100644
--- a/crypto/BUILD.gn
+++ b/crypto/BUILD.gn
@@ -106,17 +106,11 @@ component("crypto") {
]
}
- if (!is_linux) {
+ if (use_openssl || !is_linux) {
sources -= [
"openpgp_symmetric_encryption.cc",
"openpgp_symmetric_encryption.h",
]
- if (use_nss) { # Removed for non-NSS in all cases below.
- sources -= [
- "openpgp_symmetric_encryption.cc",
- "openpgp_symmetric_encryption.h",
- ]
- }
}
if (!is_mac) {
sources -= [
@@ -133,7 +127,8 @@ component("crypto") {
]
}
- if (!use_nss) {
+ if (use_openssl) {
+ # Remove NSS files when using OpenSSL
sources -= [
"ec_private_key_nss.cc",
"ec_signature_creator_nss.cc",
@@ -153,8 +148,8 @@ component("crypto") {
"third_party/nss/rsawrapr.c",
"third_party/nss/secsign.cc",
]
- }
- if (!use_openssl) {
+ } else {
+ # Remove OpenSSL when using NSS.
sources -= [
"ec_private_key_openssl.cc",
"ec_signature_creator_openssl.cc",
« no previous file with comments | « build/toolchain/win/BUILD.gn ('k') | net/BUILD.gn » ('j') | skia/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698