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 /Android.mk | |
| parent | ac6c5371f5e5beafc345f312a097c3ebd4766afa (diff) | |
| download | external_boringssl-7086cfcae53d483d858dca38f37ac54c95719de7.tar.gz external_boringssl-7086cfcae53d483d858dca38f37ac54c95719de7.tar.bz2 external_boringssl-7086cfcae53d483d858dca38f37ac54c95719de7.zip | |
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 'Android.mk')
| -rw-r--r-- | Android.mk | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -45,6 +45,10 @@ LOCAL_MODULE_TAGS := optional 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 +# Windows and Macs both have problems with assembly files +ifneq ($(HOST_OS),linux) +LOCAL_CFLAGS += -DOPENSSL_NO_ASM +endif include $(LOCAL_PATH)/crypto-sources.mk include $(BUILD_HOST_STATIC_LIBRARY) @@ -56,6 +60,10 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_MULTILIB := both LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/crypto-sources.mk LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION +# Windows and Macs both have problems with assembly files +ifneq ($(HOST_OS),linux) +LOCAL_CFLAGS += -DOPENSSL_NO_ASM +endif include $(LOCAL_PATH)/crypto-sources.mk include $(BUILD_HOST_SHARED_LIBRARY) |