diff options
| author | jingzhao@chromium.org <jingzhao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 06:16:47 +0000 |
|---|---|---|
| committer | jingzhao@chromium.org <jingzhao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 06:16:47 +0000 |
| commit | 28ea774b9b8e169cf8a0ce9d04d8219390f988cd (patch) | |
| tree | ec83379439e46a983e0a10f12c5aa6710982fcb8 /crypto | |
| parent | 1acc0bb23795010c761bab0f396a31543e7f0121 (diff) | |
| download | chromium_src-28ea774b9b8e169cf8a0ce9d04d8219390f988cd.zip chromium_src-28ea774b9b8e169cf8a0ce9d04d8219390f988cd.tar.gz chromium_src-28ea774b9b8e169cf8a0ce9d04d8219390f988cd.tar.bz2 | |
Upstream: Build crypto_unittests for Android.
Review URL: http://codereview.chromium.org/9328034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/crypto.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp index 32065f4..1d216f6 100644 --- a/crypto/crypto.gyp +++ b/crypto/crypto.gyp @@ -237,7 +237,7 @@ '../testing/gtest.gyp:gtest', ], 'conditions': [ - [ 'os_posix == 1 and OS != "mac"', { + [ 'os_posix == 1 and OS != "mac" and OS != "android"', { 'conditions': [ [ 'linux_use_tcmalloc==1', { 'dependencies': [ @@ -249,7 +249,7 @@ 'dependencies': [ '../build/linux/system.gyp:ssl', ], - }, { # os_posix != 1 or OS == "mac" + }, { # os_posix != 1 or OS == "mac" or OS == "android" 'sources!': [ 'rsa_private_key_nss_unittest.cc', 'openpgp_symmetric_encryption_unittest.cc', |