Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 78273c6492 am: b4e7bdd7df am: 1261c502b6 am: 1d29028213
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/mio/+/1912752
Change-Id: I498e01bf9cc8c47e93a0d2d85fd02c9ad8fec41c
diff --git a/Android.bp b/Android.bp
index 23f810f..0f45ce1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -47,14 +47,18 @@
min_sdk_version: "29",
}
-rust_defaults {
- name: "mio_test_defaults",
+rust_test {
+ name: "mio_test_src_lib",
+ host_supported: true,
crate_name: "mio",
- srcs: ["src/lib.rs"],
cargo_env_compat: true,
cargo_pkg_version: "0.7.13",
+ srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"net",
@@ -72,16 +76,3 @@
"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 feaeab6..88a3a20 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,224 +1,39 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/futures-util"
+ },
+ {
+ "path": "external/rust/crates/quiche"
+ },
+ {
+ "path": "external/rust/crates/tokio"
+ },
+ {
+ "path": "external/rust/crates/tokio-test"
+ }
+ ],
"presubmit": [
{
"name": "doh_unit_test"
},
{
- "name": "futures-util_device_test_src_lib"
+ "name": "mio_test_src_lib"
},
{
- "name": "mio_device_test_src_lib"
- },
+ "name": "rustBinderTest"
+ }
+ ],
+ "presubmit-rust": [
{
- "name": "quiche_device_test_src_lib"
+ "name": "doh_unit_test"
},
{
- "name": "tokio-test_device_test_src_lib"
+ "name": "mio_test_src_lib"
},
{
- "name": "tokio-test_device_test_tests_block_on"
- },
- {
- "name": "tokio-test_device_test_tests_io"
- },
- {
- "name": "tokio-test_device_test_tests_macros"
- },
- {
- "name": "tokio_device_test_tests__require_full"
- },
- {
- "name": "tokio_device_test_tests_buffered"
- },
- {
- "name": "tokio_device_test_tests_io_async_fd"
- },
- {
- "name": "tokio_device_test_tests_io_async_read"
- },
- {
- "name": "tokio_device_test_tests_io_chain"
- },
- {
- "name": "tokio_device_test_tests_io_copy"
- },
- {
- "name": "tokio_device_test_tests_io_copy_bidirectional"
- },
- {
- "name": "tokio_device_test_tests_io_driver"
- },
- {
- "name": "tokio_device_test_tests_io_driver_drop"
- },
- {
- "name": "tokio_device_test_tests_io_lines"
- },
- {
- "name": "tokio_device_test_tests_io_mem_stream"
- },
- {
- "name": "tokio_device_test_tests_io_read"
- },
- {
- "name": "tokio_device_test_tests_io_read_buf"
- },
- {
- "name": "tokio_device_test_tests_io_read_exact"
- },
- {
- "name": "tokio_device_test_tests_io_read_line"
- },
- {
- "name": "tokio_device_test_tests_io_read_to_end"
- },
- {
- "name": "tokio_device_test_tests_io_read_to_string"
- },
- {
- "name": "tokio_device_test_tests_io_read_until"
- },
- {
- "name": "tokio_device_test_tests_io_split"
- },
- {
- "name": "tokio_device_test_tests_io_take"
- },
- {
- "name": "tokio_device_test_tests_io_write"
- },
- {
- "name": "tokio_device_test_tests_io_write_all"
- },
- {
- "name": "tokio_device_test_tests_io_write_buf"
- },
- {
- "name": "tokio_device_test_tests_io_write_int"
- },
- {
- "name": "tokio_device_test_tests_macros_join"
- },
- {
- "name": "tokio_device_test_tests_macros_pin"
- },
- {
- "name": "tokio_device_test_tests_macros_select"
- },
- {
- "name": "tokio_device_test_tests_macros_test"
- },
- {
- "name": "tokio_device_test_tests_macros_try_join"
- },
- {
- "name": "tokio_device_test_tests_net_bind_resource"
- },
- {
- "name": "tokio_device_test_tests_net_lookup_host"
- },
- {
- "name": "tokio_device_test_tests_no_rt"
- },
- {
- "name": "tokio_device_test_tests_process_kill_on_drop"
- },
- {
- "name": "tokio_device_test_tests_rt_basic"
- },
- {
- "name": "tokio_device_test_tests_rt_common"
- },
- {
- "name": "tokio_device_test_tests_rt_threaded"
- },
- {
- "name": "tokio_device_test_tests_sync_barrier"
- },
- {
- "name": "tokio_device_test_tests_sync_broadcast"
- },
- {
- "name": "tokio_device_test_tests_sync_errors"
- },
- {
- "name": "tokio_device_test_tests_sync_mpsc"
- },
- {
- "name": "tokio_device_test_tests_sync_mutex"
- },
- {
- "name": "tokio_device_test_tests_sync_mutex_owned"
- },
- {
- "name": "tokio_device_test_tests_sync_notify"
- },
- {
- "name": "tokio_device_test_tests_sync_oneshot"
- },
- {
- "name": "tokio_device_test_tests_sync_rwlock"
- },
- {
- "name": "tokio_device_test_tests_sync_semaphore"
- },
- {
- "name": "tokio_device_test_tests_sync_semaphore_owned"
- },
- {
- "name": "tokio_device_test_tests_sync_watch"
- },
- {
- "name": "tokio_device_test_tests_task_abort"
- },
- {
- "name": "tokio_device_test_tests_task_blocking"
- },
- {
- "name": "tokio_device_test_tests_task_local"
- },
- {
- "name": "tokio_device_test_tests_task_local_set"
- },
- {
- "name": "tokio_device_test_tests_tcp_accept"
- },
- {
- "name": "tokio_device_test_tests_tcp_connect"
- },
- {
- "name": "tokio_device_test_tests_tcp_echo"
- },
- {
- "name": "tokio_device_test_tests_tcp_into_split"
- },
- {
- "name": "tokio_device_test_tests_tcp_into_std"
- },
- {
- "name": "tokio_device_test_tests_tcp_peek"
- },
- {
- "name": "tokio_device_test_tests_tcp_shutdown"
- },
- {
- "name": "tokio_device_test_tests_tcp_socket"
- },
- {
- "name": "tokio_device_test_tests_tcp_split"
- },
- {
- "name": "tokio_device_test_tests_time_rt"
- },
- {
- "name": "tokio_device_test_tests_udp"
- },
- {
- "name": "tokio_device_test_tests_uds_cred"
- },
- {
- "name": "tokio_device_test_tests_uds_split"
+ "name": "rustBinderTest"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 9c92ef6..72b501b 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -10,4 +10,4 @@
"min-sdk-version": "29",
"run": true,
"tests": true
-}
+}
\ No newline at end of file