summaryrefslogtreecommitdiffstats
path: root/crypto-sources.mk
diff options
context:
space:
mode:
Diffstat (limited to 'crypto-sources.mk')
-rw-r--r--crypto-sources.mk13
1 files changed, 5 insertions, 8 deletions
diff --git a/crypto-sources.mk b/crypto-sources.mk
index a5b8ba3..d90d109 100644
--- a/crypto-sources.mk
+++ b/crypto-sources.mk
@@ -4,13 +4,10 @@ include $(LOCAL_PATH)/sources.mk
LOCAL_CFLAGS += -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH)/src/crypto -Wno-unused-parameter -DBORINGSSL_ANDROID_SYSTEM
LOCAL_ASFLAGS += -I$(LOCAL_PATH)/src/include -I$(LOCAL_PATH)/src/crypto -Wno-unused-parameter
# Do not add in the architecture-specific files if we don't want to build assembly
-ifeq ($(LOCAL_IS_HOST_MODULE),true)
-LOCAL_SRC_FILES_linux_x86 := $(linux_x86_sources)
-LOCAL_SRC_FILES_linux_x86_64 := $(linux_x86_64_sources)
-else
-LOCAL_SRC_FILES_x86 := $(linux_x86_sources)
-LOCAL_SRC_FILES_x86_64 := $(linux_x86_64_sources)
-LOCAL_SRC_FILES_arm := $(linux_arm_sources)
-LOCAL_SRC_FILES_arm64 := $(linux_aarch64_sources)
+ifeq (,$(filter -DOPENSSL_NO_ASM,$(LOCAL_CFLAGS)))
+LOCAL_SRC_FILES_x86 = $(linux_x86_sources)
+LOCAL_SRC_FILES_x86_64 = $(linux_x86_64_sources)
+LOCAL_SRC_FILES_arm = $(linux_arm_sources)
+LOCAL_SRC_FILES_arm64 = $(linux_aarch64_sources)
endif
LOCAL_SRC_FILES += $(crypto_sources)