diff options
| author | Bert Belder <bertbelder@gmail.com> | 2012-08-28 02:54:22 +0200 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2012-08-28 02:54:22 +0200 |
| commit | bf16d9280ea7aadce5c5437184c1d80e651a997a (patch) | |
| tree | 85c570a9c80181c9bd84ce8bcc726d644daa36db /deps/openssl/openssl.gyp | |
| parent | 4822d780bb913c9ef7c2301a181a5834887cddb4 (diff) | |
| parent | 24184345688e1f545ffc87e5742de06ed9855007 (diff) | |
| download | android-node-v8-bf16d9280ea7aadce5c5437184c1d80e651a997a.tar.gz android-node-v8-bf16d9280ea7aadce5c5437184c1d80e651a997a.tar.bz2 android-node-v8-bf16d9280ea7aadce5c5437184c1d80e651a997a.zip | |
Merge branch 'v0.8'
Conflicts:
ChangeLog
deps/openssl/openssl.gyp
src/node_version.h
Diffstat (limited to 'deps/openssl/openssl.gyp')
| -rw-r--r-- | deps/openssl/openssl.gyp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index c9dc07dc87..4bd39cd81f 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -652,11 +652,18 @@ 'sources': [ 'openssl/crypto/bn/bn_asm.c', ] - }, { + }], + ['target_arch=="x64"', { 'variables': {'openssl_config_path': 'config/k8'}, 'sources': [ 'openssl/crypto/bn/asm/x86_64-gcc.c', ] + }], + ['target_arch=="arm"', { + 'variables': {'openssl_config_path': 'config/android'}, + 'sources': [ + 'openssl/crypto/bn/bn_asm.c', + ] }] ], 'include_dirs': [ |