Opt-out of STL libssl and libcrypto don't use STL, set LOCAL_CXX_STL := none for the host modules. Change-Id: Ib75e18bb5bea995a287858592809a59a696e32ea
diff --git a/Apps.mk b/Apps.mk index b2d871c..4c224ce 100644 --- a/Apps.mk +++ b/Apps.mk
@@ -19,6 +19,7 @@ LOCAL_MODULE := openssl LOCAL_MODULE_TAGS := optional LOCAL_SHARED_LIBRARIES := libssl-host libcrypto-host +LOCAL_CXX_STL := none include $(LOCAL_PATH)/Apps-config-host.mk include $(LOCAL_PATH)/android-config.mk LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Apps.mk
diff --git a/Crypto.mk b/Crypto.mk index 40a3b26..aba5dac 100644 --- a/Crypto.mk +++ b/Crypto.mk
@@ -53,6 +53,7 @@ LOCAL_MODULE := libcrypto-host LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Crypto.mk LOCAL_MULTILIB := both +LOCAL_CXX_STL := none include $(LOCAL_PATH)/Crypto-config-host.mk include $(LOCAL_PATH)/android-config.mk include $(BUILD_HOST_SHARED_LIBRARY) @@ -68,6 +69,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libcrypto_static LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Crypto.mk +LOCAL_CXX_STL := none include $(LOCAL_PATH)/Crypto-config-host.mk include $(LOCAL_PATH)/android-config.mk include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/Ssl.mk b/Ssl.mk index c80ed61..5500667 100644 --- a/Ssl.mk +++ b/Ssl.mk
@@ -52,6 +52,7 @@ LOCAL_MODULE := libssl-host LOCAL_MULTILIB := both LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Ssl.mk +LOCAL_CXX_STL := none include $(LOCAL_PATH)/Ssl-config-host.mk include $(LOCAL_PATH)/android-config.mk include $(BUILD_HOST_SHARED_LIBRARY)