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

Unified Diff: net/third_party/nss/ssl.gyp

Issue 2322008: Use SSLClientSocketNSS on Mac OS X. ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Add build/linux/system.gyp to the CL. Created 10 years, 7 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
« build/all.gyp ('K') | « net/third_party/nss/nss.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/third_party/nss/ssl.gyp
===================================================================
--- net/third_party/nss/ssl.gyp (revision 48533)
+++ net/third_party/nss/ssl.gyp (working copy)
@@ -67,6 +67,10 @@
'ssl/bodge/loader.h',
'ssl/bodge/secure_memcmp.c',
],
+ 'sources!': [
+ 'ssl/os2_err.c',
+ 'ssl/os2_err.h',
+ ],
'defines': [
'NSS_ENABLE_ECC',
'NSS_ENABLE_ZLIB',
@@ -77,13 +81,20 @@
'NO_NSPR_10_SUPPORT',
],
'conditions': [
+ [ 'OS == "win"', {
+ 'sources!': [
+ 'ssl/unix_err.c',
+ 'ssl/unix_err.h',
+ ],
+ },
+ { # else: OS != "win"
+ 'sources!': [
+ 'ssl/win32err.c',
+ 'ssl/win32err.h',
+ ],
+ },
+ ],
[ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
- 'sources!': [
- 'ssl/os2_err.c',
- 'ssl/os2_err.h',
- 'ssl/win32err.c',
- 'ssl/win32err.h',
- ],
'defines': [
# These macros are needed only for compiling the files in
# ssl/bodge.
@@ -105,16 +116,10 @@
'<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
],
}],
- [ 'OS == "win"', {
+ [ 'OS == "mac" or OS == "win"', {
'sources/': [
['exclude', 'ssl/bodge/'],
],
- 'sources!': [
- 'ssl/os2_err.c',
- 'ssl/os2_err.h',
- 'ssl/unix_err.c',
- 'ssl/unix_err.h',
- ],
'dependencies': [
'../../../third_party/zlib/zlib.gyp:zlib',
'../../../third_party/nss/nss.gyp:nss',
« build/all.gyp ('K') | « net/third_party/nss/nss.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698