diff options
| author | Kenny Root <kroot@google.com> | 2015-12-04 12:52:23 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-12-04 13:35:00 -0800 |
| commit | 65073cf7bf38b3bd3ab0cb8688bfa6ccc2f59387 (patch) | |
| tree | 2c8bc69f71e4baba9b74f5e8a0fe13f6f8dcca8a | |
| parent | 658a3498901326a0544d9a5410061a975fd0988d (diff) | |
| download | external_boringssl-65073cf7bf38b3bd3ab0cb8688bfa6ccc2f59387.zip external_boringssl-65073cf7bf38b3bd3ab0cb8688bfa6ccc2f59387.tar.gz external_boringssl-65073cf7bf38b3bd3ab0cb8688bfa6ccc2f59387.tar.bz2 | |
Revert "Revert "Opt-out of STL""
Now with a proper pthread dependency.
This reverts commit 658a3498901326a0544d9a5410061a975fd0988d.
Change-Id: I98414598c885904cb1988f30b339da7181cda341
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 6 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,9 @@ 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_LDLIBS_darwin := -lpthread +LOCAL_LDLIBS_linux := -lpthread +LOCAL_CXX_STL := none include $(LOCAL_PATH)/crypto-sources.mk include $(BUILD_HOST_SHARED_LIBRARY) @@ -108,6 +112,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 +141,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) |