diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-07-19 21:22:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-19 21:22:31 +0000 |
| commit | e1afb50aba8cc245230d3993db584384d0aa76a3 (patch) | |
| tree | 8309963b63ca0c3f4efaa855be4e698175d1da49 | |
| parent | cbea5a728e7bc4b64f14ab3bfd4f52ca8d1c6012 (diff) | |
| parent | a724c1a0fce0a117df51c4f88e1210765657bd1b (diff) | |
| download | quiche-e1afb50aba8cc245230d3993db584384d0aa76a3.tar.gz | |
Use cargo2android.py to generate the data property. am: 4e89923524 am: a724c1a0fc
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/quiche/+/1771594
Change-Id: I50d0ef5aaae9f8ea1d588752aa6e748a84f4a278
| -rw-r--r-- | Android.bp | 14 | ||||
| -rw-r--r-- | cargo2android.json | 8 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 16 |
3 files changed, 19 insertions, 19 deletions
@@ -101,7 +101,7 @@ rust_library_rlib { } rust_defaults { - name: "quiche_defaults", + name: "quiche_test_defaults", crate_name: "quiche", srcs: ["src/lib.rs"], test_suites: ["general-tests"], @@ -125,12 +125,12 @@ rust_defaults { "examples/cert.key", "examples/cert-big.crt", "examples/rootca.crt", - ] + ], } rust_test_host { name: "quiche_host_test_src_lib", - defaults: ["quiche_defaults"], + defaults: ["quiche_test_defaults"], test_options: { unit_test: true, }, @@ -142,7 +142,7 @@ rust_test_host { 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: [ @@ -152,20 +152,20 @@ rust_test { } // dependent_library ["feature_list"] -// cc-1.0.68 +// cc-1.0.69 // cfg-if-0.1.10 // cfg-if-1.0.0 // cmake-0.1.45 // idna-0.1.5 // iovec-0.1.4 // lazy_static-1.4.0 -// libc-0.2.95 "default,std" +// libc-0.2.98 "default,std" // libm-0.2.1 "default" // log-0.4.14 "std" // matches-0.1.8 // mio-0.6.23 "default,with-deprecated" // net2-0.2.37 "default,duration" -// once_cell-1.7.2 "alloc,race,std" +// once_cell-1.8.0 "alloc,race,std" // percent-encoding-1.0.1 // ring-0.16.20 "alloc,default,dev_urandom_fallback,once_cell" // slab-0.4.3 "default,std" diff --git a/cargo2android.json b/cargo2android.json index e34fbf5..94f80e4 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -5,8 +5,14 @@ ], "min_sdk_version": "29", "dependencies": true, + "test-data": [ + "src/lib.rs=examples/cert.crt", + "src/lib.rs=examples/cert.key", + "src/lib.rs=examples/cert-big.crt", + "src/lib.rs=examples/rootca.crt" + ], "tests": true, "device": true, "run": true, "patch": "patches/Android.bp.patch" - }
\ No newline at end of file +}
\ No newline at end of file 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: [ |