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

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

Issue 10692060: Add iOS support to ssl.gyp and zlib.gyp (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 6 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 | third_party/zlib/zlib.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/third_party/nss/ssl.gyp
diff --git a/net/third_party/nss/ssl.gyp b/net/third_party/nss/ssl.gyp
index 260897afd979f068739fff36303028b5106d4ec7..07f1b64fb941af0cbd1acb42bcf335fdb72f6c1d 100644
--- a/net/third_party/nss/ssl.gyp
+++ b/net/third_party/nss/ssl.gyp
@@ -4,7 +4,7 @@
{
'conditions': [
- [ 'os_posix == 1 and OS != "mac"', {
+ [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
'conditions': [
['sysroot!=""', {
'variables': {
@@ -89,7 +89,7 @@
],
'msvs_disabled_warnings': [4018, 4244],
'conditions': [
- [ 'OS=="mac"', {
+ [ 'OS == "mac" or OS == "ios"', {
'defines': [
'XP_UNIX',
'DARWIN',
@@ -109,7 +109,7 @@
],
},
],
- [ 'os_posix == 1 and OS != "mac"', {
+ [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
'defines': [
# These macros are needed only for compiling the files in
# ssl/bodge.
@@ -131,12 +131,21 @@
'<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
],
}],
- [ 'OS == "mac" or OS == "win"', {
+ [ 'OS == "mac" or OS == "ios" or OS == "win"', {
'sources/': [
['exclude', 'ssl/bodge/'],
],
- 'defines': [
- 'NSS_PLATFORM_CLIENT_AUTH',
+ 'conditions': [
+ ['OS != "ios"', {
+ 'defines': [
+ 'NSS_PLATFORM_CLIENT_AUTH',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'NSS_PLATFORM_CLIENT_AUTH',
+ ],
+ },
+ }],
],
'dependencies': [
'../../../third_party/nss/nss.gyp:nspr',
@@ -150,9 +159,6 @@
'include_dirs': [
'ssl',
],
- 'defines': [
- 'NSS_PLATFORM_CLIENT_AUTH',
- ],
},
}],
],
« no previous file with comments | « no previous file | third_party/zlib/zlib.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698