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 /net | |
| 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 'net')
| -rw-r--r-- | net/net.gyp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/net.gyp b/net/net.gyp index b6b12c3..ca4b4d3 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -37,6 +37,7 @@ '../base/base.gyp:base_i18n', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../build/temp_gyp/googleurl.gyp:googleurl', + '../crypto/crypto.gyp:crypto', '../sdch/sdch.gyp:sdch', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', @@ -811,9 +812,6 @@ 'conditions': [ ['OS != "ios"', { 'dependencies': [ - # TODO(ios): This is temporary; Move this back to the main - # dependencies section once crypto builds for iOS. - '../crypto/crypto.gyp:crypto', # The v8 gyp file is not available in the iOS tree. '../v8/tools/gyp/v8.gyp:v8', ], |