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

Unified Diff: webrtc/base/base.gyp

Issue 1311843006: Revert of purge nss files and dependencies (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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 | « webrtc/base/BUILD.gn ('k') | webrtc/base/helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/base.gyp
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index 0e2636e0d9ea91eb16d8b90652a9db4c934df4b2..37646a863771f31cb80bfa0a2494a520946ff645 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -528,6 +528,51 @@
],
}],
],
+ }, {
+ 'sources': [
+ 'nssidentity.cc',
+ 'nssidentity.h',
+ 'nssstreamadapter.cc',
+ 'nssstreamadapter.h',
+ ],
+ 'conditions': [
+ ['use_legacy_ssl_defaults!=1', {
+ 'defines': [
+ 'SSL_USE_NSS',
+ 'HAVE_NSS_SSL_H',
+ 'SSL_USE_NSS_RNG',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'SSL_USE_NSS',
+ 'HAVE_NSS_SSL_H',
+ 'SSL_USE_NSS_RNG',
+ ],
+ },
+ }],
+ ['build_ssl==1', {
+ 'conditions': [
+ # On some platforms, the rest of NSS is bundled. On others,
+ # it's pulled from the system.
+ ['OS == "mac" or OS == "ios"', {
+ 'dependencies': [
+ '<(DEPTH)/net/third_party/nss/ssl.gyp:libssl',
+ '<(DEPTH)/third_party/nss/nss.gyp:nspr',
+ '<(DEPTH)/third_party/nss/nss.gyp:nss',
+ ],
+ }],
+ ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
+ 'dependencies': [
+ '<(DEPTH)/build/linux/system.gyp:ssl',
+ ],
+ }],
+ ],
+ }, {
+ 'include_dirs': [
+ '<(ssl_root)',
+ ],
+ }],
+ ],
}],
['OS == "android"', {
'link_settings': {
« no previous file with comments | « webrtc/base/BUILD.gn ('k') | webrtc/base/helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698