Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 5bdbcff46b am: 0a8fc67a26 am: d002f98c41 am: d2d27ec8e5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rand_chacha/+/1912658
Change-Id: I01274f8244bf9c5cc8d6b525a5accf3a5099bbd9
diff --git a/Android.bp b/Android.bp
index c1ac7ac..0e15608 100644
--- a/Android.bp
+++ b/Android.bp
@@ -60,14 +60,18 @@
],
}
-rust_defaults {
- name: "rand_chacha_test_defaults",
+rust_test {
+ name: "rand_chacha_test_src_lib",
+ host_supported: true,
crate_name: "rand_chacha",
- srcs: ["src/lib.rs"],
cargo_env_compat: true,
cargo_pkg_version: "0.3.1",
+ srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
features: [
"default",
@@ -79,16 +83,3 @@
"libserde_json",
],
}
-
-rust_test_host {
- name: "rand_chacha_host_test_src_lib",
- defaults: ["rand_chacha_test_defaults"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "rand_chacha_device_test_src_lib",
- defaults: ["rand_chacha_test_defaults"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 7c2f56b..3f99cb1 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,65 +1,52 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/base64"
+ },
+ {
+ "path": "external/rust/crates/cast"
+ },
+ {
+ "path": "external/rust/crates/crc32fast"
+ },
+ {
+ "path": "external/rust/crates/crossbeam-deque"
+ },
+ {
+ "path": "external/rust/crates/crossbeam-epoch"
+ },
+ {
+ "path": "external/rust/crates/crossbeam-queue"
+ },
+ {
+ "path": "external/rust/crates/crossbeam-utils"
+ },
+ {
+ "path": "external/rust/crates/mio"
+ },
+ {
+ "path": "external/rust/crates/quickcheck"
+ },
+ {
+ "path": "external/rust/crates/regex"
+ },
+ {
+ "path": "external/rust/crates/ryu"
+ },
+ {
+ "path": "external/rust/crates/tokio"
+ }
+ ],
"presubmit": [
{
- "name": "base64_device_test_tests_decode"
+ "name": "ZipFuseTest"
},
{
- "name": "base64_device_test_tests_encode"
+ "name": "apkdmverity.test"
},
{
- "name": "base64_device_test_tests_helpers"
- },
- {
- "name": "crossbeam-deque_device_test_src_lib"
- },
- {
- "name": "crossbeam-deque_device_test_tests_fifo"
- },
- {
- "name": "crossbeam-deque_device_test_tests_injector"
- },
- {
- "name": "crossbeam-deque_device_test_tests_lifo"
- },
- {
- "name": "crossbeam-deque_device_test_tests_steal"
- },
- {
- "name": "crossbeam-epoch_device_test_src_lib"
- },
- {
- "name": "crossbeam-epoch_device_test_tests_loom"
- },
- {
- "name": "crossbeam-queue_device_test_src_lib"
- },
- {
- "name": "crossbeam-queue_device_test_tests_array_queue"
- },
- {
- "name": "crossbeam-queue_device_test_tests_seg_queue"
- },
- {
- "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": "authfs_device_test_src_lib"
},
{
"name": "keystore2_test"
@@ -71,205 +58,42 @@
"name": "legacykeystore_test"
},
{
- "name": "mio_device_test_src_lib"
+ "name": "microdroid_manager_test"
},
{
- "name": "rand_chacha_device_test_src_lib"
+ "name": "rand_chacha_test_src_lib"
},
{
- "name": "tokio_device_test_tests__require_full"
- },
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
{
- "name": "tokio_device_test_tests_buffered"
+ "name": "ZipFuseTest"
},
{
- "name": "tokio_device_test_tests_io_async_fd"
+ "name": "apkdmverity.test"
},
{
- "name": "tokio_device_test_tests_io_async_read"
+ "name": "authfs_device_test_src_lib"
},
{
- "name": "tokio_device_test_tests_io_chain"
+ "name": "keystore2_test"
},
{
- "name": "tokio_device_test_tests_io_copy"
+ "name": "keystore2_test_utils_test"
},
{
- "name": "tokio_device_test_tests_io_copy_bidirectional"
+ "name": "legacykeystore_test"
},
{
- "name": "tokio_device_test_tests_io_driver"
+ "name": "microdroid_manager_test"
},
{
- "name": "tokio_device_test_tests_io_driver_drop"
+ "name": "rand_chacha_test_src_lib"
},
{
- "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": "virtualizationservice_device_test"
}
]
}
diff --git a/cargo2android.json b/cargo2android.json
index 72ca2d4..ac56e26 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -7,4 +7,4 @@
"device": true,
"run": true,
"tests": true
-}
+}
\ No newline at end of file
