diff options
| author | Adam Langley <agl@google.com> | 2015-05-13 20:30:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-13 20:30:34 +0000 |
| commit | 20c0e128bfc97a344e2d4c2963420bad3b0cccd0 (patch) | |
| tree | 401f38eb29416e2b85dd1a202d9ab978bc565712 | |
| parent | 8a27a4f008220d488a64ee999c9cfe5898732fad (diff) | |
| parent | db3f2575bc1cc154694c80b6c011b9fe76d88b6c (diff) | |
| download | external_boringssl-20c0e128bfc97a344e2d4c2963420bad3b0cccd0.zip external_boringssl-20c0e128bfc97a344e2d4c2963420bad3b0cccd0.tar.gz external_boringssl-20c0e128bfc97a344e2d4c2963420bad3b0cccd0.tar.bz2 | |
am db3f2575: am aae4cd28: external/boringssl: work around Clang\'s lack of adrl.
* commit 'db3f2575bc1cc154694c80b6c011b9fe76d88b6c':
external/boringssl: work around Clang's lack of adrl.
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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 |