diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 15:27:59 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-15 15:27:59 +0000 |
commit | 6b43ae8a17aa877a47be88f0a515417cdbf83b08 (patch) | |
tree | 9c25f72ee1d1a42d90a7fa16c700452485962d80 | |
parent | a37c83b4993c86b1408528d9c5df32ca0de72275 (diff) | |
parent | 03a354c2606201c5799504ae42d979aa1a70ee68 (diff) | |
download | futures-util-6b43ae8a17aa877a47be88f0a515417cdbf83b08.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."
-rw-r--r-- | Android.bp | 23 | ||||
-rw-r--r-- | TEST_MAPPING | 249 | ||||
-rw-r--r-- | cargo2android.json | 2 |
3 files changed, 25 insertions, 249 deletions
@@ -37,14 +37,18 @@ license { ], } -rust_defaults { - name: "futures-util_test_defaults", +rust_test { + name: "futures-util_test_src_lib", + host_supported: true, crate_name: "futures_util", - 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", @@ -84,19 +88,6 @@ rust_defaults { ], } -rust_test_host { - name: "futures-util_host_test_src_lib", - defaults: ["futures-util_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "futures-util_device_test_src_lib", - defaults: ["futures-util_test_defaults"], -} - rust_library { name: "libfutures_util", host_supported: true, diff --git a/TEST_MAPPING b/TEST_MAPPING index 82d12c9..1c27227 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,44 +1,19 @@ // 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" - }, - { - "name": "anyhow_device_test_tests_test_chain" - }, - { - "name": "anyhow_device_test_tests_test_context" - }, - { - "name": "anyhow_device_test_tests_test_convert" - }, - { - "name": "anyhow_device_test_tests_test_downcast" - }, - { - "name": "anyhow_device_test_tests_test_ffi" - }, + "imports": [ { - "name": "anyhow_device_test_tests_test_fmt" + "path": "external/rust/crates/anyhow" }, { - "name": "anyhow_device_test_tests_test_macros" + "path": "external/rust/crates/tokio" }, { - "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,214 +22,24 @@ "name": "doh_unit_test" }, { - "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-util_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-util_test_src_lib" }, { "name": "virtualizationservice_device_test" diff --git a/cargo2android.json b/cargo2android.json index 8bef0a5..0d5d517 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -4,10 +4,10 @@ "com.android.resolv", "com.android.virt" ], - "min_sdk_version": "29", "dependencies": true, "device": true, "features": "channel,default,io,memchr,sink", + "min-sdk-version": "29", "run": true, "tests": true }
\ No newline at end of file |