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

Unified Diff: crypto/crypto.gyp

Issue 8429034: Upstream: Build net_unittests for Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: split out unreviewed files Created 9 years, 1 month 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 | crypto/rsa_private_key.cc » ('j') | 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 3a566310b382d2950f3df5852c1bdf1a76c8a5a1..416f64c4f874e3a4f3651764221be14b254491f9 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': [
« no previous file with comments | « no previous file | crypto/rsa_private_key.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698