Index: base/base.gypi |
=================================================================== |
--- base/base.gypi (revision 48533) |
+++ base/base.gypi (working copy) |
@@ -331,15 +331,8 @@ |
'sources/': [ ['exclude', '_openbsd\\.cc$'] ], |
}, |
], |
- [ 'OS == "mac"', { |
+ [ 'OS != "mac"', { |
'sources!': [ |
- # TODO(wtc): Remove nss_util.{cc,h} when http://crbug.com/30689 |
- # is fixed. |
- 'nss_util.cc', |
- 'nss_util.h', |
- ], |
- }, { # OS != "mac" |
- 'sources!': [ |
'crypto/cssm_init.cc', |
'crypto/cssm_init.h', |
], |
@@ -452,11 +445,12 @@ |
], |
}, |
},], |
- [ 'OS == "win"', { |
+ [ 'OS == "mac" or OS == "win"', { |
'dependencies': [ |
'../third_party/nss/nss.gyp:nss', |
], |
- }, { # OS != "win" |
+ },], |
+ [ 'OS != "win"', { |
'dependencies': ['../third_party/libevent/libevent.gyp:libevent'], |
'sources!': [ |
'third_party/purify/pure_api.c', |