diff options
| author | Kenny Root <kroot@google.com> | 2015-10-02 17:37:41 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-10-02 17:40:09 -0700 |
| commit | b58f8d1fed1cfc47760125d23160ca78f364722b (patch) | |
| tree | a95c347114d34e87826c3c3811e3410bb24d2f10 /Android.mk | |
| parent | fe7305364c3369f9222a61646c5c9842eae9bceb (diff) | |
| download | external_boringssl-b58f8d1fed1cfc47760125d23160ca78f364722b.zip external_boringssl-b58f8d1fed1cfc47760125d23160ca78f364722b.tar.gz external_boringssl-b58f8d1fed1cfc47760125d23160ca78f364722b.tar.bz2 | |
DO NOT MERGE ANYWHERE Revert "Whitelist windows modules"
This is only needed in the mnc-ub-dev branch to deal with the older
build project.
This reverts commit 08656b61d075740bfb24ddcce65223146259fc02.
Change-Id: I7440e3d6371e6d98f1f77705f8bf374e7f37fbe2
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -49,29 +49,30 @@ include $(BUILD_EXECUTABLE) # Host static library include $(CLEAR_VARS) -LOCAL_IS_HOST_MODULE := true +LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libcrypto_static -LOCAL_MODULE_HOST_OS := darwin linux windows 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 -Wno-unused-parameter # Windows and Macs both have problems with assembly files -LOCAL_CFLAGS_darwin += -DOPENSSL_NO_ASM -LOCAL_CFLAGS_windows += -DOPENSSL_NO_ASM +ifneq ($(HOST_OS),linux) +LOCAL_CFLAGS += -DOPENSSL_NO_ASM +endif include $(LOCAL_PATH)/crypto-sources.mk include $(BUILD_HOST_STATIC_LIBRARY) # Host shared library include $(CLEAR_VARS) -LOCAL_IS_HOST_MODULE := true +LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libcrypto-host 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 -Wno-unused-parameter # Windows and Macs both have problems with assembly files -LOCAL_CFLAGS_darwin += -DOPENSSL_NO_ASM -LOCAL_CFLAGS_windows += -DOPENSSL_NO_ASM +ifneq ($(HOST_OS),linux) +LOCAL_CFLAGS += -DOPENSSL_NO_ASM +endif include $(LOCAL_PATH)/crypto-sources.mk include $(BUILD_HOST_SHARED_LIBRARY) |