Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Unified Diff: crypto/crypto.gyp

Issue 9328034: Upstream: Build crypto_unittests for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/crypto.gyp
diff --git a/crypto/crypto.gyp b/crypto/crypto.gyp
index 32065f4f0ff7aecf6765a03d4b80295d93f60c3e..1d216f6f185b60b6e9c4fafee6fd9f74e591c89b 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',
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698