diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:29 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:29 +0000 |
commit | 5c1994a047f933c6fac6f891f5215e0140cd4549 (patch) | |
tree | 858bd5e42515f6d5833d6e17d6245863c49477ee | |
parent | bb1044482f95429f38a5ea93cd9224b64004d73c (diff) | |
parent | e74161eb929885b539e5438b88ebe3430fedcf47 (diff) | |
download | rand-5c1994a047f933c6fac6f891f5215e0140cd4549.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 307af85ac2 am: e74161eb92
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rand/+/1912628
Change-Id: I43b68d36b6d542a9ab885c377b78b243858a841d
-rw-r--r-- | TEST_MAPPING | 219 | ||||
-rw-r--r-- | cargo2android.json | 6 |
2 files changed, 38 insertions, 187 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING index 27e89b9..ff12af6 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,242 +1,93 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ - { - "name": "base64_device_test_tests_decode" - }, - { - "name": "base64_device_test_tests_encode" - }, - { - "name": "base64_device_test_tests_helpers" - }, - { - "name": "crossbeam-epoch_device_test_src_lib" - }, - { - "name": "crossbeam-epoch_device_test_tests_loom" - }, - { - "name": "crossbeam-utils_device_test_src_lib" - }, - { - "name": "crossbeam-utils_device_test_tests_atomic_cell" - }, - { - "name": "crossbeam-utils_device_test_tests_cache_padded" - }, - { - "name": "crossbeam-utils_device_test_tests_parker" - }, - { - "name": "crossbeam-utils_device_test_tests_sharded_lock" - }, - { - "name": "crossbeam-utils_device_test_tests_thread" - }, - { - "name": "crossbeam-utils_device_test_tests_wait_group" - }, - { - "name": "keystore2_test" - }, - { - "name": "legacykeystore_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" - }, + "imports": [ { - "name": "tokio_device_test_tests_io_read_exact" + "path": "external/rust/crates/base64" }, { - "name": "tokio_device_test_tests_io_read_line" + "path": "external/rust/crates/cast" }, { - "name": "tokio_device_test_tests_io_read_to_end" + "path": "external/rust/crates/crc32fast" }, { - "name": "tokio_device_test_tests_io_read_to_string" + "path": "external/rust/crates/crossbeam-deque" }, { - "name": "tokio_device_test_tests_io_read_until" + "path": "external/rust/crates/crossbeam-epoch" }, { - "name": "tokio_device_test_tests_io_split" + "path": "external/rust/crates/crossbeam-queue" }, { - "name": "tokio_device_test_tests_io_take" + "path": "external/rust/crates/crossbeam-utils" }, { - "name": "tokio_device_test_tests_io_write" + "path": "external/rust/crates/mio" }, { - "name": "tokio_device_test_tests_io_write_all" + "path": "external/rust/crates/quickcheck" }, { - "name": "tokio_device_test_tests_io_write_buf" + "path": "external/rust/crates/regex" }, { - "name": "tokio_device_test_tests_io_write_int" + "path": "external/rust/crates/ryu" }, { - "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" - }, + "path": "external/rust/crates/tokio" + } + ], + "presubmit": [ { - "name": "tokio_device_test_tests_task_blocking" + "name": "ZipFuseTest" }, { - "name": "tokio_device_test_tests_task_local" + "name": "apkdmverity.test" }, { - "name": "tokio_device_test_tests_task_local_set" + "name": "authfs_device_test_src_lib" }, { - "name": "tokio_device_test_tests_tcp_accept" + "name": "keystore2_test" }, { - "name": "tokio_device_test_tests_tcp_connect" + "name": "keystore2_test_utils_test" }, { - "name": "tokio_device_test_tests_tcp_echo" + "name": "legacykeystore_test" }, { - "name": "tokio_device_test_tests_tcp_into_split" + "name": "microdroid_manager_test" }, { - "name": "tokio_device_test_tests_tcp_into_std" - }, + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ { - "name": "tokio_device_test_tests_tcp_peek" + "name": "ZipFuseTest" }, { - "name": "tokio_device_test_tests_tcp_shutdown" + "name": "apkdmverity.test" }, { - "name": "tokio_device_test_tests_tcp_socket" + "name": "authfs_device_test_src_lib" }, { - "name": "tokio_device_test_tests_tcp_split" + "name": "keystore2_test" }, { - "name": "tokio_device_test_tests_time_rt" + "name": "keystore2_test_utils_test" }, { - "name": "tokio_device_test_tests_udp" + "name": "legacykeystore_test" }, { - "name": "tokio_device_test_tests_uds_cred" + "name": "microdroid_manager_test" }, { - "name": "tokio_device_test_tests_uds_split" + "name": "virtualizationservice_device_test" } ] } diff --git a/cargo2android.json b/cargo2android.json index f2dbe12..cdb5c0d 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -5,6 +5,6 @@ ], "dependencies": true, "device": true, - "run": true, - "features": "default,small_rng" -} + "features": "default,small_rng", + "run": true +}
\ No newline at end of file |