diff options
| author | Colin Cross <ccross@android.com> | 2015-12-04 19:42:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-04 19:42:53 +0000 |
| commit | b5f5c45e5ffe193364913e93006dfcfafb76db8f (patch) | |
| tree | 408e542a67fe6a68d6b8eed401d406c2baef5bfb | |
| parent | 0872af0089f9e8079205b4d4b1a6115025f96221 (diff) | |
| parent | f88d692da8c082678ff553efcba725df93b2f4a1 (diff) | |
| download | external_boringssl-b5f5c45e5ffe193364913e93006dfcfafb76db8f.zip external_boringssl-b5f5c45e5ffe193364913e93006dfcfafb76db8f.tar.gz external_boringssl-b5f5c45e5ffe193364913e93006dfcfafb76db8f.tar.bz2 | |
Opt-out of STL
am: f88d692da8
* commit 'f88d692da8c082678ff553efcba725df93b2f4a1':
Opt-out of STL
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 4 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,7 @@ 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) @@ -108,6 +110,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 +139,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) |