diff options
author | Colin Cross <ccross@android.com> | 2015-12-03 15:41:30 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2015-12-03 15:41:30 -0800 |
commit | f88d692da8c082678ff553efcba725df93b2f4a1 (patch) | |
tree | 408e542a67fe6a68d6b8eed401d406c2baef5bfb | |
parent | fad6327e4112082b1e77e89a995723f26bd5a9aa (diff) | |
download | external_boringssl-f88d692da8c082678ff553efcba725df93b2f4a1.zip external_boringssl-f88d692da8c082678ff553efcba725df93b2f4a1.tar.gz external_boringssl-f88d692da8c082678ff553efcba725df93b2f4a1.tar.bz2 |
Opt-out of STL
libssl and libcrypto don't use STL, set LOCAL_CXX_STL := none for the
host modules.
Change-Id: I22c36e477ec812a38dc1c6463bd398503a1f4b69
-rw-r--r-- | Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -55,6 +55,7 @@ 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 -DOPENSSL_SMALL -Wno-unused-parameter +LOCAL_CXX_STL := none # Windows and Macs both have problems with assembly files LOCAL_CFLAGS_darwin += -DOPENSSL_NO_ASM LOCAL_CFLAGS_windows += -DOPENSSL_NO_ASM @@ -72,6 +73,7 @@ LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLE # Windows and Macs both have problems with assembly files LOCAL_CFLAGS_darwin += -DOPENSSL_NO_ASM LOCAL_CFLAGS_windows += -DOPENSSL_NO_ASM +LOCAL_CXX_STL := none include $(LOCAL_PATH)/crypto-sources.mk include $(BUILD_HOST_SHARED_LIBRARY) @@ -108,6 +110,7 @@ LOCAL_MODULE := libssl_static-host LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/ssl-sources.mk LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION -DOPENSSL_SMALL -Wno-unused-parameter +LOCAL_CXX_STL := none include $(LOCAL_PATH)/ssl-sources.mk include $(BUILD_HOST_STATIC_LIBRARY) @@ -136,6 +139,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/src/include LOCAL_MULTILIB := both LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk $(LOCAL_PATH)/ssl-sources.mk LOCAL_CFLAGS += -fvisibility=hidden -DBORINGSSL_SHARED_LIBRARY -DBORINGSSL_IMPLEMENTATION -DOPENSSL_SMALL -Wno-unused-parameter +LOCAL_CXX_STL := none LOCAL_SHARED_LIBRARIES += libcrypto-host include $(LOCAL_PATH)/ssl-sources.mk include $(BUILD_HOST_SHARED_LIBRARY) |