Commit 28ea774b authored by jingzhao@chromium.org's avatar jingzhao@chromium.org

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
parent 1acc0bb2
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
'../testing/gtest.gyp:gtest', '../testing/gtest.gyp:gtest',
], ],
'conditions': [ 'conditions': [
[ 'os_posix == 1 and OS != "mac"', { [ 'os_posix == 1 and OS != "mac" and OS != "android"', {
'conditions': [ 'conditions': [
[ 'linux_use_tcmalloc==1', { [ 'linux_use_tcmalloc==1', {
'dependencies': [ 'dependencies': [
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
'dependencies': [ 'dependencies': [
'../build/linux/system.gyp:ssl', '../build/linux/system.gyp:ssl',
], ],
}, { # os_posix != 1 or OS == "mac" }, { # os_posix != 1 or OS == "mac" or OS == "android"
'sources!': [ 'sources!': [
'rsa_private_key_nss_unittest.cc', 'rsa_private_key_nss_unittest.cc',
'openpgp_symmetric_encryption_unittest.cc', 'openpgp_symmetric_encryption_unittest.cc',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment