diff options
author | Joel Galenson <jgalenson@google.com> | 2021-11-29 14:03:48 -0800 |
---|---|---|
committer | Joel Galenson <jgalenson@google.com> | 2021-12-10 15:32:45 -0800 |
commit | 97778a17aa4a7c5b45e93d07b8137815a75d7e2d (patch) | |
tree | 6a981c615f285d99799a6661a63aeb80c46094e9 | |
parent | fb6d77547c792553c259c30546d69dee70f014e3 (diff) | |
download | futures-task-97778a17aa4a7c5b45e93d07b8137815a75d7e2d.tar.gz |
Refresh Android.bp, cargo2android.json, TEST_MAPPING.
Test: None
Change-Id: I6160f37f6e1215f66e42cb3f9760a9d50c8262e3
-rw-r--r-- | Android.bp | 23 | ||||
-rw-r--r-- | TEST_MAPPING | 251 | ||||
-rw-r--r-- | cargo2android.json | 2 |
3 files changed, 26 insertions, 250 deletions
@@ -37,14 +37,18 @@ license { ], } -rust_defaults { - name: "futures-task_test_defaults", +rust_test { + name: "futures-task_test_src_lib", + host_supported: true, crate_name: "futures_task", - srcs: ["src/lib.rs"], cargo_env_compat: true, cargo_pkg_version: "0.3.17", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "alloc", @@ -53,19 +57,6 @@ rust_defaults { ], } -rust_test_host { - name: "futures-task_host_test_src_lib", - defaults: ["futures-task_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "futures-task_device_test_src_lib", - defaults: ["futures-task_test_defaults"], -} - rust_library { name: "libfutures_task", host_supported: true, diff --git a/TEST_MAPPING b/TEST_MAPPING index ed67b9f..64f7c12 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,44 +1,22 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ - { - "name": "ZipFuseTest" - }, - { - "name": "anyhow_device_test_src_lib" - }, - { - "name": "anyhow_device_test_tests_test_autotrait" - }, - { - "name": "anyhow_device_test_tests_test_boxed" - }, + "imports": [ { - "name": "anyhow_device_test_tests_test_chain" + "path": "external/rust/crates/anyhow" }, { - "name": "anyhow_device_test_tests_test_context" + "path": "external/rust/crates/futures-util" }, { - "name": "anyhow_device_test_tests_test_convert" + "path": "external/rust/crates/tokio" }, { - "name": "anyhow_device_test_tests_test_downcast" - }, - { - "name": "anyhow_device_test_tests_test_ffi" - }, - { - "name": "anyhow_device_test_tests_test_fmt" - }, - { - "name": "anyhow_device_test_tests_test_macros" - }, - { - "name": "anyhow_device_test_tests_test_repr" - }, + "path": "external/rust/crates/tokio-test" + } + ], + "presubmit": [ { - "name": "anyhow_device_test_tests_test_source" + "name": "ZipFuseTest" }, { "name": "authfs_device_test_src_lib" @@ -47,217 +25,24 @@ "name": "doh_unit_test" }, { - "name": "futures-task_device_test_src_lib" - }, - { - "name": "futures-util_device_test_src_lib" - }, - { - "name": "tokio-test_device_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": "futures-task_test_src_lib" }, { - "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": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ { - "name": "tokio_device_test_tests_time_rt" + "name": "ZipFuseTest" }, { - "name": "tokio_device_test_tests_udp" + "name": "authfs_device_test_src_lib" }, { - "name": "tokio_device_test_tests_uds_cred" + "name": "doh_unit_test" }, { - "name": "tokio_device_test_tests_uds_split" + "name": "futures-task_test_src_lib" }, { "name": "virtualizationservice_device_test" diff --git a/cargo2android.json b/cargo2android.json index 44e747c..5412b5b 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -4,9 +4,9 @@ "com.android.resolv", "com.android.virt" ], - "min_sdk_version": "29", "dependencies": true, "device": true, + "min-sdk-version": "29", "run": true, "tests": true }
\ No newline at end of file |