diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-07-19 21:05:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-19 21:05:54 +0000 |
| commit | a724c1a0fce0a117df51c4f88e1210765657bd1b (patch) | |
| tree | 8309963b63ca0c3f4efaa855be4e698175d1da49 /patches/Android.bp.patch | |
| parent | e5e32aa3679c9a5ba075a8001fec916e9959c6df (diff) | |
| parent | 4e89923524121e6362841edeb42292590f051c47 (diff) | |
| download | quiche-a724c1a0fce0a117df51c4f88e1210765657bd1b.tar.gz | |
Use cargo2android.py to generate the data property. am: 4e89923524
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/1771594
Change-Id: Ic6aa282fbc1ad0757915e3d0f899136caae7cbc9
Diffstat (limited to 'patches/Android.bp.patch')
| -rw-r--r-- | patches/Android.bp.patch | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index fbd8d17..f6a32f4 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -115,7 +115,7 @@ index aced8a6..578cc68 100644 "default", ], rustlibs: [ -@@ -139,10 +120,12 @@ rust_defaults { +@@ -139,10 +120,6 @@ rust_defaults { "libring", "liburl", ], @@ -123,15 +123,9 @@ index aced8a6..578cc68 100644 - "libcrypto", - "libssl", - ], -+ data: [ -+ "examples/cert.crt", -+ "examples/cert.key", -+ "examples/cert-big.crt", -+ "examples/rootca.crt", -+ ] - } - - rust_test_host { + data: [ + "examples/cert.crt", + "examples/cert.key", @@ -151,11 +134,21 @@ rust_test_host { test_options: { unit_test: true, @@ -144,7 +138,7 @@ index aced8a6..578cc68 100644 rust_test { name: "quiche_device_test_src_lib", - defaults: ["quiche_defaults"], + defaults: ["quiche_test_defaults"], + // To run this test in R platform, it's required to statically link + // libcrypto and libssl. + static_libs: [ |