diff options
| author | msarda@chromium.org <msarda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 10:24:54 +0000 |
|---|---|---|
| committer | msarda@chromium.org <msarda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 10:24:54 +0000 |
| commit | 271428d65bc85c4d3989a6782c8b3747c89564f4 (patch) | |
| tree | 932b1c376875ec1cf4b6775bb2619fdd9df01a63 /crypto/crypto.gyp | |
| parent | 9e56f798538a6c859ccb4d44bd014c552df951a4 (diff) | |
| download | chromium_src-271428d65bc85c4d3989a6782c8b3747c89564f4.zip chromium_src-271428d65bc85c4d3989a6782c8b3747c89564f4.tar.gz chromium_src-271428d65bc85c4d3989a6782c8b3747c89564f4.tar.bz2 | |
Built crypto and crypto_unittests for iOS
Adds iOS support to crypto.gyp. Both targets now build, but the tests may not
run correctly, and not all the crypto code is correct yet for iOS.
BUG=NONE
Review URL: https://chromiumcodereview.appspot.com/10830183
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/crypto.gyp')
| -rw-r--r-- | crypto/crypto.gyp | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index e124423..33b6b17 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', @@ -262,7 +262,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 +274,26 @@ '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!': [ + # These tests are excluded because they test classes that are not + # implemented on iOS. + 'rsa_private_key_unittest.cc', + 'signature_creator_unittest.cc', + 'signature_verifier_unittest.cc', + ], + }], [ 'OS == "mac"', { 'dependencies': [ '../third_party/nss/nss.gyp:nspr', |