diff options
| author | Kenny Root <kroot@google.com> | 2015-03-04 16:00:41 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-03-04 17:05:37 -0800 |
| commit | 7086cfcae53d483d858dca38f37ac54c95719de7 (patch) | |
| tree | 35320f4db378f9093b37fd5b606afbeeb15f7fb0 /crypto-sources.mk | |
| parent | ac6c5371f5e5beafc345f312a097c3ebd4766afa (diff) | |
| download | external_boringssl-7086cfcae53d483d858dca38f37ac54c95719de7.zip external_boringssl-7086cfcae53d483d858dca38f37ac54c95719de7.tar.gz external_boringssl-7086cfcae53d483d858dca38f37ac54c95719de7.tar.bz2 | |
Android: disable assembly for Mac and Windows
There are various problems with assembly on both the Mac and Windows
builds, so just disable it for now.
Change-Id: I6163e97089c17f70ef9361279319badd22c354b2
Diffstat (limited to 'crypto-sources.mk')
| -rw-r--r-- | crypto-sources.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto-sources.mk b/crypto-sources.mk index a575406..78194f2 100644 --- a/crypto-sources.mk +++ b/crypto-sources.mk @@ -2,8 +2,11 @@ LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/sources.mk include $(LOCAL_PATH)/sources.mk LOCAL_CFLAGS += -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 (,$(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) |