diff options
| author | Kenny Root <kroot@google.com> | 2015-12-04 21:49:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-04 21:49:11 +0000 |
| commit | 33ac50efbf0d77ee2848b2ad0464f1dce6428c15 (patch) | |
| tree | 2c8bc69f71e4baba9b74f5e8a0fe13f6f8dcca8a | |
| parent | 0bc4c526ba3dd9c03ce55429de6a68cd62430cf6 (diff) | |
| parent | 65073cf7bf38b3bd3ab0cb8688bfa6ccc2f59387 (diff) | |
| download | external_boringssl-33ac50efbf0d77ee2848b2ad0464f1dce6428c15.zip external_boringssl-33ac50efbf0d77ee2848b2ad0464f1dce6428c15.tar.gz external_boringssl-33ac50efbf0d77ee2848b2ad0464f1dce6428c15.tar.bz2 | |
Revert "Revert "Opt-out of STL""
am: 65073cf7bf
* commit '65073cf7bf38b3bd3ab0cb8688bfa6ccc2f59387':
Revert "Revert "Opt-out of STL""
| -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) |