| commit | 4c22c5fad19b2a554bcb056ca25ca4cc2ef6a45c | [log] [tgz] |
|---|---|---|
| author | Robert Sloan <varomodt@google.com> | Fri Mar 01 15:53:37 2019 -0800 |
| committer | Robert Sloan <varomodt@google.com> | Fri Mar 01 16:02:19 2019 -0800 |
| tree | fb0dc666dadcc955218e7a701ea482a9270d1a53 | |
| parent | b6b07c32187eec60f4c9f27e0959c58d145f87ef [diff] [blame] |
external/boringssl: Sync to c3889634a1aa52575c5d26497696238208fbd0f5. This includes the following changes: https://boringssl.googlesource.com/boringssl/+log/41c10e2b5f37edce8b9f292f7f3bacb7e30e25c4..c3889634a1aa52575c5d26497696238208fbd0f5 Test: atest CtsLibcoreTestCases Change-Id: Ia1c2941ccf58a9e0d736b3409a2d13c21603a205
diff --git a/src/crypto/test/CMakeLists.txt b/src/crypto/test/CMakeLists.txt index 3e02c3c..b968fd7 100644 --- a/src/crypto/test/CMakeLists.txt +++ b/src/crypto/test/CMakeLists.txt
@@ -1,15 +1,24 @@ add_library( - test_support + test_support_lib - OBJECT + STATIC + abi_test.cc file_test.cc malloc.cc test_util.cc wycheproof_util.cc ) -add_dependencies(test_support global_target) +if (LIBUNWIND_FOUND) + target_compile_options(test_support_lib PRIVATE ${LIBUNWIND_CFLAGS_OTHER}) + target_include_directories(test_support_lib PRIVATE ${LIBUNWIND_INCLUDE_DIRS}) + target_link_libraries(test_support_lib ${LIBUNWIND_LDFLAGS}) +endif() +if(WIN32) + target_link_libraries(test_support_lib dbghelp) +endif() +add_dependencies(test_support_lib global_target) add_library( boringssl_gtest_main