diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:50 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:50 +0000 |
commit | dec9d01f56b8b7ce813242bca5f794e6a677fbe7 (patch) | |
tree | 293b023ba8fe48611250ad53c41366a5fda89f35 | |
parent | 56a73a16e6ecc34b6fc69a8e83ed1c715a5f5782 (diff) | |
parent | 56a8d9d78a43d833d3c40f31ff6ec86e8905c50d (diff) | |
download | futures-dec9d01f56b8b7ce813242bca5f794e6a677fbe7.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 0d29e2f912 am: 56a8d9d78a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/futures/+/1912521
Change-Id: I14ae2f7e04cb8eb2745e915c18e4826aafe06b80
-rw-r--r-- | TEST_MAPPING | 237 | ||||
-rw-r--r-- | cargo2android.json | 2 |
2 files changed, 15 insertions, 224 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING index d98c77a..e2df61d 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,44 +1,16 @@ // 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" - }, - { - "name": "anyhow_device_test_tests_test_repr" - }, + "path": "external/rust/crates/tokio" + } + ], + "presubmit": [ { - "name": "anyhow_device_test_tests_test_source" + "name": "ZipFuseTest" }, { "name": "authfs_device_test_src_lib" @@ -47,199 +19,18 @@ "name": "doh_unit_test" }, { - "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": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ { - "name": "tokio_device_test_tests_udp" + "name": "ZipFuseTest" }, { - "name": "tokio_device_test_tests_uds_cred" + "name": "authfs_device_test_src_lib" }, { - "name": "tokio_device_test_tests_uds_split" + "name": "doh_unit_test" }, { "name": "virtualizationservice_device_test" diff --git a/cargo2android.json b/cargo2android.json index 01465d0..2e8c0ea 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -4,8 +4,8 @@ "com.android.resolv", "com.android.virt" ], - "min_sdk_version": "29", "dependencies": true, "device": true, + "min-sdk-version": "29", "run": true }
\ No newline at end of file |