diff options
| author | jingzhao@chromium.org <jingzhao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 11:41:16 +0000 |
|---|---|---|
| committer | jingzhao@chromium.org <jingzhao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 11:41:16 +0000 |
| commit | ae7c9f4d3c23cbd5ef60508a5710beccad59a428 (patch) | |
| tree | 57379ee4e0467f4310c5ba35202180002fcf59a8 /crypto/crypto.gyp | |
| parent | 3d40d9e210b016e3148640be63bfc1c5f16827c5 (diff) | |
| download | chromium_src-ae7c9f4d3c23cbd5ef60508a5710beccad59a428.zip chromium_src-ae7c9f4d3c23cbd5ef60508a5710beccad59a428.tar.gz chromium_src-ae7c9f4d3c23cbd5ef60508a5710beccad59a428.tar.bz2 | |
Upstream: Build net_unittests for Android.
BUG=
TEST=
Review URL: http://codereview.chromium.org/8429034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/crypto.gyp')
| -rw-r--r-- | crypto/crypto.gyp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index 3a56631..416f64c 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -22,7 +22,7 @@ 4018, ], 'conditions': [ - [ 'os_posix == 1 and OS != "mac"', { + [ 'os_posix == 1 and OS != "mac" and OS != "android"', { 'dependencies': [ '../build/linux/system.gyp:ssl', ], @@ -35,7 +35,7 @@ }, ], ], - }, { # os_posix != 1 or OS == "mac" + }, { # os_posix != 1 or OS == "mac" or OS == "android" 'sources/': [ ['exclude', '_nss\.cc$'], ['include', 'ec_private_key_nss\.cc$'], @@ -44,6 +44,14 @@ 'openpgp_symmetric_encryption.cc', ], }], + [ 'OS == "android"', { + 'dependencies': [ + '../build/android/system.gyp:ssl', + ], + 'sources/': [ + ['exclude', 'ec_private_key_nss\.cc$'], + ], + }], [ 'OS == "freebsd" or OS == "openbsd"', { 'link_settings': { 'libraries': [ |