diff options
| author | Kenny Root <kroot@google.com> | 2015-12-04 20:44:07 +0000 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-12-04 20:44:07 +0000 |
| commit | 658a3498901326a0544d9a5410061a975fd0988d (patch) | |
| tree | a1a6dd4f0310c9a9ce682a0436f80e27c56bf8e4 | |
| parent | f88d692da8c082678ff553efcba725df93b2f4a1 (diff) | |
| download | external_boringssl-658a3498901326a0544d9a5410061a975fd0988d.zip external_boringssl-658a3498901326a0544d9a5410061a975fd0988d.tar.gz external_boringssl-658a3498901326a0544d9a5410061a975fd0988d.tar.bz2 | |
Revert "Opt-out of STL"
We were depending on pthread that was being pulled in via STL, so revert
this until we can fix the dependency correctly.
This reverts commit f88d692da8c082678ff553efcba725df93b2f4a1.
Change-Id: Ica803c825db66e52ffa1d41cf709da9313dded1b
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -55,7 +55,6 @@ 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 @@ -73,7 +72,6 @@ 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) @@ -110,7 +108,6 @@ 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) @@ -139,7 +136,6 @@ 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) |