diff options
author | Colin Cross <ccross@android.com> | 2015-12-04 00:49:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-04 00:49:03 +0000 |
commit | e67c7edd65f69f58535fb358a8665a23e5de62a4 (patch) | |
tree | 5e86f2e64a00eb6d1cf7fb9c724f5d9f20e8d206 | |
parent | 8f91cebafb81c066046842a0f0b892cecea1466a (diff) | |
parent | 9d833757190dc6f7dee5971e6c2c02c9740bda16 (diff) | |
download | openssl-e67c7edd65f69f58535fb358a8665a23e5de62a4.tar.gz |
Merge "Opt-out of STL"
-rw-r--r-- | Apps.mk | 1 | ||||
-rw-r--r-- | Crypto.mk | 2 | ||||
-rw-r--r-- | Ssl.mk | 1 |
3 files changed, 4 insertions, 0 deletions
@@ -19,6 +19,7 @@ include $(CLEAR_VARS) 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 @@ -53,6 +53,7 @@ LOCAL_MODULE_TAGS := optional 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_LDLIBS += -ldl 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) @@ -52,6 +52,7 @@ LOCAL_MODULE_TAGS := optional 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) |