summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-04-20 16:00:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-20 16:00:28 +0000
commitd706386f41c0f4cdc4d6fe69b7c0f76f897ee4b5 (patch)
tree3aa14dddb3cd83f10f517f1854028082621058ce /Android.mk
parent21cf1bc5f95966bff28ca8067ae84acc67972e61 (diff)
parenteef60be96fb91dc632a18173b4a4f21e9813aba7 (diff)
downloadboringssl-d706386f41c0f4cdc4d6fe69b7c0f76f897ee4b5.tar.gz
am eef60be9: external/boringssl: try to fix aarch64+Clang.
* commit 'eef60be96fb91dc632a18173b4a4f21e9813aba7': external/boringssl: try to fix aarch64+Clang.
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk10
1 files changed, 10 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 3fbff636..27e786d1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,6 +13,11 @@ 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
+ifeq ($(TARGET_ARCH),arm64)
+ifeq ($(USE_CLANG_PLATFORM_BUILD),true)
+LOCAL_ASFLAGS += -march=armv8-a+crypto
+endif
+endif
include $(LOCAL_PATH)/crypto-sources.mk
include $(BUILD_STATIC_LIBRARY)
@@ -24,6 +29,11 @@ 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
+ifeq ($(TARGET_ARCH),arm64)
+ifeq ($(USE_CLANG_PLATFORM_BUILD),true)
+LOCAL_ASFLAGS += -march=armv8-a+crypto
+endif
+endif
include $(LOCAL_PATH)/crypto-sources.mk
include $(BUILD_SHARED_LIBRARY)