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

Unified Diff: base/base.gypi

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
« no previous file with comments | « no previous file | base/nss_util.cc » ('j') | build/all.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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',
« no previous file with comments | « no previous file | base/nss_util.cc » ('j') | build/all.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698