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

Unified Diff: build/all.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
« no previous file with comments | « base/nss_util.cc ('k') | build/linux/system.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
===================================================================
--- build/all.gyp (revision 48533)
+++ build/all.gyp (working copy)
@@ -19,6 +19,7 @@
'../ipc/ipc.gyp:*',
'../media/media.gyp:*',
'../net/net.gyp:*',
+ '../net/third_party/nss/ssl.gyp:*',
Mark Mentovai 2010/06/01 19:28:37 This file now says "net/third_party/nss/ssl.gyp:*"
'../printing/printing.gyp:*',
'../sdch/sdch.gyp:*',
'../skia/skia.gyp:*',
@@ -58,6 +59,11 @@
'../third_party/yasm/yasm.gyp:*#host',
],
}],
+ ['OS=="mac" or OS=="win"', {
+ 'dependencies': [
+ '../third_party/nss/nss.gyp:*',
+ ],
+ }],
['OS=="mac"', {
'dependencies': [
'../third_party/ocmock/ocmock.gyp:*',
@@ -81,7 +87,6 @@
'dependencies': [
'../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*',
'../tools/xdisplaycheck/xdisplaycheck.gyp:*',
- '../net/third_party/nss/nss.gyp:*',
],
}],
['OS=="win"', {
« no previous file with comments | « base/nss_util.cc ('k') | build/linux/system.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698