From 192f5b50e32ed14945317325a5465f40abfcc587 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 28 Oct 2014 23:07:58 +0100
Subject: Update Openssl to aosp/master (includes useless (for OpenVPN)) SSLv3
 Fallback fix

--HG--
extra : rebase_source : 4ec3b7a7844aa1ca198c4538ecdf28f027ceb1b1
---
 main/openssl/Crypto-config-target.mk | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'main/openssl/Crypto-config-target.mk')

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)
-- 
cgit v1.2.3