commit 12956e176de90a3e64b6960071746276ea01bcb7
author Kenny Root <kroot@google.com> Wed May 13 17:38:02 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 13 17:38:02 2015 +0000
tree 6e29d72fe299cfdaf3cc5e8f6fe7fa1e4d9437be
parent aae4cd28e487a1554bc5d290b73fcf9aeeb31370
parent 430091c556d1086167da3320cbb60aa0079486e7

Merge "external/boringssl: support arbitrary elliptic curve groups."

Android.mk

diff --git a/Android.mk b/Android.mk
index 27e786d..cebeb2c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,6 +13,8 @@
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/crypto-sources.mk
 LOCAL_SDK_VERSION := 9
+# sha256-armv4.S does not compile with clang.
+LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
 ifeq ($(TARGET_ARCH),arm64)
 ifeq ($(USE_CLANG_PLATFORM_BUILD),true)
 LOCAL_ASFLAGS += -march=armv8-a+crypto
@@ -29,6 +31,8 @@
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/crypto-sources.mk
 LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION
 LOCAL_SDK_VERSION := 9
+# sha256-armv4.S does not compile with clang.
+LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
 ifeq ($(TARGET_ARCH),arm64)
 ifeq ($(USE_CLANG_PLATFORM_BUILD),true)
 LOCAL_ASFLAGS += -march=armv8-a+crypto