From f8fd9aca8bd01fa7226e1abe75a5bcf903f287ab Mon Sep 17 00:00:00 2001 From: Nathan Rajlich Date: Thu, 23 Aug 2012 11:28:17 -0700 Subject: build: use the openssl android configuration for "arm" builds --- deps/openssl/openssl.gyp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'deps/openssl') diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index 7a031ec249..cbc00079a9 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -650,9 +650,13 @@ }], ['target_arch=="ia32"', { 'variables': {'openssl_config_path': 'config/piii'}, - }, { + }], + ['target_arch=="x64"', { 'variables': {'openssl_config_path': 'config/k8'}, }], + ['target_arch=="arm"', { + 'variables': {'openssl_config_path': 'config/android'}, + }], ], 'include_dirs': [ '.', -- cgit v1.2.3 From 7142b260c6c299fc9697e6554620be47a6f622a9 Mon Sep 17 00:00:00 2001 From: Nathan Rajlich Date: Thu, 23 Aug 2012 11:28:47 -0700 Subject: build: tweak the openssl android configuration to build Removed NO_CAST, NO_MD2 and NO_STORE because otherwise there were build errors. Added NO_CAMELLIA, NO_MDC2, and NO_CMS because otherwise there were linker errors. --- deps/openssl/config/android/openssl/opensslconf.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'deps/openssl') diff --git a/deps/openssl/config/android/openssl/opensslconf.h b/deps/openssl/config/android/openssl/opensslconf.h index 26ac6ba3aa..9280eb2863 100644 --- a/deps/openssl/config/android/openssl/opensslconf.h +++ b/deps/openssl/config/android/openssl/opensslconf.h @@ -5,8 +5,8 @@ #ifndef OPENSSL_DOING_MAKEDEPEND -#ifndef OPENSSL_NO_CAST -# define OPENSSL_NO_CAST +#ifndef OPENSSL_NO_CAMELLIA +# define OPENSSL_NO_CAMELLIA #endif #ifndef OPENSSL_NO_GMP # define OPENSSL_NO_GMP @@ -20,8 +20,11 @@ #ifndef OPENSSL_NO_KRB5 # define OPENSSL_NO_KRB5 #endif -#ifndef OPENSSL_NO_MD2 -# define OPENSSL_NO_MD2 +#ifndef OPENSSL_NO_MDC2 +# define OPENSSL_NO_MDC2 +#endif +#ifndef OPENSSL_NO_CMS +# define OPENSSL_NO_CMS #endif #ifndef OPENSSL_NO_RC5 # define OPENSSL_NO_RC5 @@ -35,9 +38,6 @@ #ifndef OPENSSL_NO_SHA0 # define OPENSSL_NO_SHA0 #endif -#ifndef OPENSSL_NO_STORE -# define OPENSSL_NO_STORE -#endif #ifndef OPENSSL_NO_WHRLPOOL # define OPENSSL_NO_WHRLPOOL #endif @@ -92,6 +92,9 @@ # if defined(OPENSSL_NO_WHRLPOOL) && !defined(NO_WHRLPOOL) # define NO_WHRLPOOL # endif +# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2) +# define NO_MDC2 +# endif #endif /* crypto/opensslconf.h.in */ -- cgit v1.2.3