| Index: crypto/crypto.gyp
|
| ===================================================================
|
| --- crypto/crypto.gyp (revision 87314)
|
| +++ crypto/crypto.gyp (working copy)
|
| @@ -19,17 +19,24 @@
|
| ],
|
| 'conditions': [
|
| [ 'os_posix == 1 and OS != "mac"', {
|
| - 'dependencies': [
|
| - '../build/linux/system.gyp:ssl',
|
| - ],
|
| - 'export_dependent_settings': [
|
| - '../build/linux/system.gyp:ssl',
|
| - ],
|
| 'conditions': [
|
| [ 'chromeos==1', {
|
| 'sources/': [ ['include', '_chromeos\\.cc$'] ]
|
| },
|
| ],
|
| + [ 'use_openssl==1', {
|
| + 'dependencies': [
|
| + '../third_party/openssl/openssl.gyp:openssl',
|
| + ],
|
| + }, { # use_openssl==0
|
| + 'dependencies': [
|
| + '../build/linux/system.gyp:nss',
|
| + ],
|
| + 'export_dependent_settings': [
|
| + '../build/linux/system.gyp:nss',
|
| + ],
|
| + }
|
| + ],
|
| ],
|
| }, { # os_posix != 1 or OS == "mac"
|
| 'sources/': [
|
| @@ -195,7 +202,7 @@
|
| ],
|
| ],
|
| 'dependencies': [
|
| - '../build/linux/system.gyp:ssl',
|
| + '../build/linux/system.gyp:nss',
|
| ],
|
| }, { # os_posix != 1 or OS == "mac"
|
| 'sources!': [
|
|
|