summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-05-13 16:32:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-13 16:32:36 +0000
commitdb3f2575bc1cc154694c80b6c011b9fe76d88b6c (patch)
tree401f38eb29416e2b85dd1a202d9ab978bc565712
parent256aa0e4c292893b0129a7c4cad6a7e205e196e1 (diff)
parentaae4cd28e487a1554bc5d290b73fcf9aeeb31370 (diff)
downloadexternal_boringssl-db3f2575bc1cc154694c80b6c011b9fe76d88b6c.zip
external_boringssl-db3f2575bc1cc154694c80b6c011b9fe76d88b6c.tar.gz
external_boringssl-db3f2575bc1cc154694c80b6c011b9fe76d88b6c.tar.bz2
am aae4cd28: external/boringssl: work around Clang\'s lack of adrl.
* commit 'aae4cd28e487a1554bc5d290b73fcf9aeeb31370': external/boringssl: work around Clang's lack of adrl.
-rw-r--r--Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 27e786d..cebeb2c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,6 +13,8 @@ LOCAL_MODULE := libcrypto_static
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_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include
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