aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2021-10-19 15:32:42 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-19 15:32:42 +0000
commit466200435a22bf240b3178c059a13ffc8e98e77b (patch)
tree2df9b9986a6da0e5ca4a657c64167cf280f59a0f
parent603bb6fab0c892b6a67fb0ccac0451b958541594 (diff)
parent2fae06e0f1ea6e0f42b04c51d6f660d010086491 (diff)
downloadmio-466200435a22bf240b3178c059a13ffc8e98e77b.tar.gz
Enable tests am: 7e2429c8c7 am: 3fb1b7b3ef am: 2fae06e0f1
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/mio/+/1862634 Change-Id: Id0aa29b9bef46e287835ec5a618ccb69921b0117
-rw-r--r--Android.bp44
-rw-r--r--TEST_MAPPING3
-rw-r--r--cargo2android.json5
3 files changed, 46 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index 7d3746f..5f6b42f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,6 +22,8 @@ rust_library {
name: "libmio",
host_supported: true,
crate_name: "mio",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.7.13",
srcs: ["src/lib.rs"],
edition: "2018",
features: [
@@ -44,7 +46,41 @@ rust_library {
min_sdk_version: "29",
}
-// dependent_library ["feature_list"]
-// cfg-if-1.0.0
-// libc-0.2.97 "default,std"
-// log-0.4.14 "std"
+rust_defaults {
+ name: "mio_test_defaults",
+ crate_name: "mio",
+ srcs: ["src/lib.rs"],
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.7.13",
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
+ edition: "2018",
+ features: [
+ "net",
+ "os-ext",
+ "os-poll",
+ "os-util",
+ "tcp",
+ "udp",
+ "uds",
+ ],
+ rustlibs: [
+ "libenv_logger",
+ "liblibc",
+ "liblog_rust",
+ "librand",
+ ],
+}
+
+rust_test_host {
+ name: "mio_host_test_src_lib",
+ defaults: ["mio_test_defaults"],
+ test_options: {
+ unit_test: true,
+ },
+}
+
+rust_test {
+ name: "mio_device_test_src_lib",
+ defaults: ["mio_test_defaults"],
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index ba26f45..feaeab6 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -8,6 +8,9 @@
"name": "futures-util_device_test_src_lib"
},
{
+ "name": "mio_device_test_src_lib"
+ },
+ {
"name": "quiche_device_test_src_lib"
},
{
diff --git a/cargo2android.json b/cargo2android.json
index 86c4a39..b2b879a 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -7,5 +7,6 @@
"device": true,
"features": "os-poll,tcp,udp,uds,os-util",
"min-sdk-version": "29",
- "run": true
-} \ No newline at end of file
+ "run": true,
+ "tests": true
+}