Index: crypto/crypto.gyp |
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp |
index 23b29861c3f749773da4cede16f2aeffeb926758..7c88e46f6b93ba037f700e855d73c231874b013f 100644 |
--- a/crypto/crypto.gyp |
+++ b/crypto/crypto.gyp |
@@ -80,7 +80,7 @@ |
'mac_security_services_lock.h', |
], |
}], |
- [ 'OS == "mac" or OS == "ios" or OS == "win"', { |
+ [ 'use_openssl == 0 and (OS == "mac" or OS == "ios" or OS == "win")', { |
'dependencies': [ |
'../third_party/nss/nss.gyp:nspr', |
'../third_party/nss/nss.gyp:nss', |
@@ -201,12 +201,12 @@ |
'openpgp_symmetric_encryption_unittest.cc', |
wtc
2014/03/27 17:40:18
I believe openpgp_symmetric_encryption_unittest.cc
wtc
2014/03/27 18:26:25
I was wrong. openpgp_symmetric_encryption_unittest
|
] |
}], |
- [ 'OS == "mac" or OS == "ios" or OS == "win"', { |
+ [ 'use_openssl == 0 and (OS == "mac" or OS == "ios" or OS == "win")', { |
'dependencies': [ |
'../third_party/nss/nss.gyp:nss', |
wtc
2014/03/27 17:40:18
I misunderstood what export_dependent_settings mea
haavardm
2014/03/27 21:10:58
Done.
It still confuses me why nspr is needed fo
wtc
2014/03/27 21:16:03
I forgot to answer that question. src/base/third_p
|
], |
}], |
- [ 'OS == "mac"', { |
+ [ 'use_openssl == 0 and OS == "mac"', { |
'dependencies': [ |
'../third_party/nss/nss.gyp:nspr', |
], |