Index: crypto/crypto.gyp |
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp |
index e124423acbabb51df6f7ac085c608d0673c4e046..24cdcb11c7f87be4164220cd52bce1a4c46f697d 100644 |
--- a/crypto/crypto.gyp |
+++ b/crypto/crypto.gyp |
@@ -35,7 +35,7 @@ |
4018, |
], |
'conditions': [ |
- [ 'os_posix == 1 and OS != "mac" and OS != "android"', { |
+ [ 'os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { |
'dependencies': [ |
'../build/linux/system.gyp:ssl', |
], |
@@ -48,7 +48,7 @@ |
}, |
], |
], |
- }, { # os_posix != 1 or OS == "mac" or OS == "android" |
+ }, { # os_posix != 1 or OS == "mac" or OS == "ios" or OS == "android" |
'sources/': [ |
['exclude', '_nss\.cc$'], |
['include', 'ec_private_key_nss\.cc$'], |
@@ -100,7 +100,7 @@ |
'mac_security_services_lock.h', |
], |
}], |
- [ 'OS == "mac" or OS == "win"', { |
+ [ 'OS == "mac" or OS == "ios" or OS == "win"', { |
'dependencies': [ |
'../third_party/nss/nss.gyp:nspr', |
'../third_party/nss/nss.gyp:nss', |
@@ -156,6 +156,16 @@ |
], |
},], |
], |
+ 'target_conditions' : [ |
+ # Use target_conditions so these apply after the ones in |
+ # build/commong.gypi so mac files can be included. |
+ [ 'OS == "ios"', { |
+ 'sources!': [ |
+ # TODO(wtc): sort out nss/openssl stuff |
stuartmorgan
2012/08/06 16:07:31
This isn't a useful comment; discuss with wtc to f
msarda
2012/08/07 08:39:44
I removed this section - this will be addressed by
wtc
2012/08/08 18:09:58
I don't know what this comment means. Perhaps som
|
+ 'rsa_private_key.cc', |
+ ], |
+ }], |
+ ], |
'sources': [ |
# NOTE: all transitive dependencies of HMAC on windows need |
# to be placed in the source list above. |
@@ -200,6 +210,7 @@ |
'random.h', |
'random.cc', |
'rsa_private_key.cc', |
+ 'rsa_private_key_ios.cc', |
'rsa_private_key.h', |
'rsa_private_key_mac.cc', |
'rsa_private_key_nss.cc', |
@@ -262,7 +273,7 @@ |
'../testing/gtest.gyp:gtest', |
], |
'conditions': [ |
- [ 'os_posix == 1 and OS != "mac" and OS != "android"', { |
+ [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"', { |
'conditions': [ |
[ 'linux_use_tcmalloc==1', { |
'dependencies': [ |
@@ -274,17 +285,25 @@ |
'dependencies': [ |
'../build/linux/system.gyp:ssl', |
], |
- }, { # os_posix != 1 or OS == "mac" or OS == "android" |
+ }, { # os_posix != 1 or OS == "mac" or OS == "android" or OS == "ios" |
'sources!': [ |
'rsa_private_key_nss_unittest.cc', |
'openpgp_symmetric_encryption_unittest.cc', |
] |
}], |
- [ 'OS == "mac" or OS == "win"', { |
+ [ 'OS == "mac" or OS == "ios" or OS == "win"', { |
'dependencies': [ |
'../third_party/nss/nss.gyp:nss', |
], |
}], |
+ ['OS == "ios"', { |
+ 'sources!': [ |
+ # TODO(wtc): sort out nss/openssl stuff |
stuartmorgan
2012/08/06 16:07:31
Same.
msarda
2012/08/07 08:39:44
I removed this section - this will be addressed by
|
+ 'rsa_private_key_unittest.cc', |
+ 'signature_creator_unittest.cc', |
+ 'signature_verifier_unittest.cc', |
+ ], |
+ }], |
[ 'OS == "mac"', { |
'dependencies': [ |
'../third_party/nss/nss.gyp:nspr', |