diff options
| author | Luke Huang <huangluke@google.com> | 2021-04-25 17:11:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-25 17:11:06 +0000 |
| commit | 9b241e9669ac118c16ed63ad27b8d559f3b583d2 (patch) | |
| tree | 8c71789fa43e6ad6912b85abf14a613aca887bd8 | |
| parent | ab6c43320906200d066170b3fd0842f8a28d6f8d (diff) | |
| parent | 4df93efda5ac235415bcb9d8edd188d7d86bdc4e (diff) | |
| download | quiche-9b241e9669ac118c16ed63ad27b8d559f3b583d2.tar.gz | |
Statically link libcrypto and libssl to quiche unit test am: 9d6d0b4d89 am: 4df93efda5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/1684346
Change-Id: I7f57813a75879c1a2d7d6e5ea9ed887ec48b6141
| -rw-r--r-- | Android.bp | 14 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 40 |
2 files changed, 41 insertions, 13 deletions
@@ -104,10 +104,6 @@ rust_defaults { "libring", "liburl", ], - shared_libs: [ - "libcrypto", - "libssl", - ], data: [ "examples/cert.crt", "examples/cert.key", @@ -122,11 +118,21 @@ rust_test_host { test_options: { unit_test: true, }, + shared_libs: [ + "libcrypto", + "libssl", + ], } rust_test { name: "quiche_device_test_src_lib", defaults: ["quiche_defaults"], + // To run this test in R platform, it's required to statically link + // libcrypto and libssl. + static_libs: [ + "libcrypto_static", + "libssl", + ], } // dependent_library ["feature_list"] diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index a4db82e..98cd60a 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -1,9 +1,10 @@ diff --git a/Android.bp b/Android.bp -index a3f7464..d398440 100644 +index 130d4f3..981eb96 100644 --- a/Android.bp +++ b/Android.bp -@@ -1,74 +1,55 @@ - // This file is generated by cargo2android.py --run --device --dependencies --tests --patch=patches/Android.bp.patch. +@@ -32,75 +32,56 @@ license { + ], + } -rust_ffi_shared { - name: "libquiche_shared", @@ -106,7 +107,7 @@ index a3f7464..d398440 100644 } rust_defaults { -@@ -79,7 +60,7 @@ rust_defaults { +@@ -111,7 +92,7 @@ rust_defaults { auto_gen_config: true, edition: "2018", features: [ @@ -115,15 +116,14 @@ index a3f7464..d398440 100644 "default", ], rustlibs: [ -@@ -91,10 +72,16 @@ rust_defaults { +@@ -123,10 +104,12 @@ rust_defaults { "libring", "liburl", ], - static_libs: [ -+ shared_libs: [ - "libcrypto", - "libssl", - ], +- "libcrypto", +- "libssl", +- ], + data: [ + "examples/cert.crt", + "examples/cert.key", @@ -133,3 +133,25 @@ index a3f7464..d398440 100644 } rust_test_host { +@@ -135,11 +118,21 @@ rust_test_host { + test_options: { + unit_test: true, + }, ++ shared_libs: [ ++ "libcrypto", ++ "libssl", ++ ], + } + + rust_test { + name: "quiche_device_test_src_lib", + defaults: ["quiche_defaults"], ++ // To run this test in R platform, it's required to statically link ++ // libcrypto and libssl. ++ static_libs: [ ++ "libcrypto_static", ++ "libssl", ++ ], + } + + // dependent_library ["feature_list"] |