diff options
author | Arne Schwabe <arne@rfc2549.org> | 2014-10-28 23:07:58 +0100 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2014-10-28 23:07:58 +0100 |
commit | 192f5b50e32ed14945317325a5465f40abfcc587 (patch) | |
tree | c58aa6ba75e3c0acaa4f9d91ab62efecf8d838bc /main/openssl/Crypto-config-target.mk | |
parent | 22feeb602f32f1d58f4aa5168b5fc139e086e85d (diff) |
Update Openssl to aosp/master (includes useless (for OpenVPN)) SSLv3 Fallback fix
--HG--
extra : rebase_source : 4ec3b7a7844aa1ca198c4538ecdf28f027ceb1b1
Diffstat (limited to 'main/openssl/Crypto-config-target.mk')
-rw-r--r-- | main/openssl/Crypto-config-target.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/openssl/Crypto-config-target.mk b/main/openssl/Crypto-config-target.mk index bd29dfe5..5851e5a3 100644 --- a/main/openssl/Crypto-config-target.mk +++ b/main/openssl/Crypto-config-target.mk @@ -695,6 +695,10 @@ mips_exclude_files := \ crypto/aes/aes_core.c \ crypto/bn/bn_asm.c \ +# At least crypto/aes/asm/bsaes-armv7.S does not compile with Clang +LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as +# crypto/aes/asm/aesv8-armx-64.S failed to compile. +LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as LOCAL_CFLAGS += $(common_cflags) LOCAL_C_INCLUDES += $(common_c_includes) |