Refresh Android.bp, cargo2android.json, TEST_MAPPING.
Test: None
Change-Id: I80221c575688ad16f3fd27bccce7600120294ba5
diff --git a/Android.bp b/Android.bp
index bf43dc5..10510bf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,7 +24,6 @@
rust_library {
name: "libnix",
host_supported: true,
- vendor_available: true,
crate_name: "nix",
cargo_env_compat: true,
cargo_pkg_version: "0.22.1",
@@ -41,4 +40,5 @@
"com.android.compos",
"com.android.virt",
],
+ vendor_available: true,
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 6785abc..0f446cc 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,10 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/tokio"
+ }
+ ],
"presubmit": [
{
"name": "ZipFuseTest"
@@ -17,205 +22,48 @@
"name": "keystore2_test"
},
{
+ "name": "keystore2_test_utils_test"
+ },
+ {
"name": "legacykeystore_test"
},
{
"name": "microdroid_manager_test"
},
{
- "name": "tokio_device_test_tests__require_full"
+ "name": "open_then_run_module"
},
{
- "name": "tokio_device_test_tests_buffered"
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "ZipFuseTest"
},
{
- "name": "tokio_device_test_tests_io_async_fd"
+ "name": "apkdmverity.test"
},
{
- "name": "tokio_device_test_tests_io_async_read"
+ "name": "keystore2_crypto_test_rust"
},
{
- "name": "tokio_device_test_tests_io_chain"
+ "name": "keystore2_selinux_concurrency_test"
},
{
- "name": "tokio_device_test_tests_io_copy"
+ "name": "keystore2_test"
},
{
- "name": "tokio_device_test_tests_io_copy_bidirectional"
+ "name": "keystore2_test_utils_test"
},
{
- "name": "tokio_device_test_tests_io_driver"
+ "name": "legacykeystore_test"
},
{
- "name": "tokio_device_test_tests_io_driver_drop"
+ "name": "microdroid_manager_test"
},
{
- "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": "open_then_run_module"
},
{
"name": "virtualizationservice_device_test"
diff --git a/cargo2android.json b/cargo2android.json
index 14f4ec8..a31a31c 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -5,7 +5,7 @@
"com.android.virt"
],
"dependencies": true,
- "vendor_available": true,
"device": true,
- "run": true
-}
+ "run": true,
+ "vendor-available": true
+}
\ No newline at end of file
