commit f95e3ce177b60bc9af35ba0ef40ae6fe385b86b0
author Chih-Hung Hsieh <chh@google.com> Wed Oct 08 17:16:18 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 08 17:16:18 2014 +0000
tree 441ca9a473b409bfe1c89324c0c08129160b0542
parent 7fca5e3ec33f7d9c0e494b86e55ecde8bf7b256a
parent 8389210d541da26b553439ea3efecfd50f9b2310

am 8389210d: Merge "Add -no-integrated-as at local level."

* commit '8389210d541da26b553439ea3efecfd50f9b2310':
  Add -no-integrated-as at local level.

Crypto-config-target.mk

diff --git a/Crypto-config-target.mk b/Crypto-config-target.mk
index 920ca64..2dbfd37 100644
--- a/Crypto-config-target.mk
+++ b/Crypto-config-target.mk
@@ -695,6 +695,10 @@
   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)