am aae4cd28: external/boringssl: work around Clang\'s lack of adrl.

* commit 'aae4cd28': external/boringssl: work around Clang's lack of adrl.

am aae4cd28: external/boringssl: work around Clang\'s lack of adrl.
* commit 'aae4cd28': external/boringssl: work around Clang's lack of adrl.
db3f2575 · Adam Langley · Android Git Automerger · 256aa0e4 · aae4cd28 · db3f2575
Commit db3f2575 authored 10 years ago by Adam Langley Committed by Android Git Automerger 10 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

Android.mk Android.mk +4 -0

No files found.
--- 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