diff options
| author | Pete Bentley <prb@google.com> | 2022-04-12 20:43:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-12 20:43:29 +0000 |
| commit | ce120061ce84a04b6702d1b9e4dc0de3f9ede602 (patch) | |
| tree | 16de0257906eded5b58a4f2938ab5726815911e6 | |
| parent | 21b5bbfb474d02efc8db3374cb5aaa87578e39ce (diff) | |
| parent | 2f045e69a2163cd3bd38b37c8920b2260d160628 (diff) | |
| download | boringssl-ce120061ce84a04b6702d1b9e4dc0de3f9ede602.tar.gz | |
Use static libraries for libcrypto and libssl native tests. am: 00087b4f30 am: 67506730c7 am: 9ff3c15dd7 am: 4af641f3e0 am: 2f045e69a2
Original change: https://android-review.googlesource.com/c/platform/external/boringssl/+/2061407
Change-Id: I7c49f3ffdc50fa0e5fa98c2cfc581951892336e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -510,7 +510,9 @@ cc_test { "boringssl_flags", ], whole_static_libs: ["boringssl_test_support"], - shared_libs: ["libcrypto"], + // Statically link the library to test to ensure we always pick up the + // correct version regardless of device linker configuration. + static_libs: ["libcrypto_static"], target: { android: { test_suites: ["mts-conscrypt"], @@ -537,9 +539,10 @@ cc_test { "boringssl_flags", ], whole_static_libs: ["boringssl_test_support"], - - shared_libs: [ - "libcrypto", + // Statically link the libraries to test to ensure we always pick up the + // correct version regardless of device linker configuration. + static_libs: [ + "libcrypto_static", "libssl", ], target: { |