Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."
diff --git a/Android.bp b/Android.bp
index 799c585..61f1010 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,61 +37,42 @@
],
}
-rust_defaults {
- name: "cfg-if_test_defaults",
+rust_test {
+ name: "cfg-if_test_src_lib",
+ host_supported: true,
crate_name: "cfg_if",
- srcs: ["src/lib.rs"],
cargo_env_compat: true,
cargo_pkg_version: "1.0.0",
+ srcs: ["src/lib.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
- edition: "2018",
-}
-
-rust_test_host {
- name: "cfg-if_host_test_src_lib",
- defaults: ["cfg-if_test_defaults"],
test_options: {
unit_test: true,
},
+ edition: "2018",
}
rust_test {
- name: "cfg-if_device_test_src_lib",
- defaults: ["cfg-if_test_defaults"],
-}
-
-rust_defaults {
- name: "cfg-if_test_defaults_xcrate",
+ name: "cfg-if_test_tests_xcrate",
+ host_supported: true,
crate_name: "xcrate",
- srcs: ["tests/xcrate.rs"],
cargo_env_compat: true,
cargo_pkg_version: "1.0.0",
+ srcs: ["tests/xcrate.rs"],
test_suites: ["general-tests"],
auto_gen_config: true,
+ test_options: {
+ unit_test: true,
+ },
edition: "2018",
rustlibs: [
"libcfg_if",
],
}
-rust_test_host {
- name: "cfg-if_host_test_tests_xcrate",
- defaults: ["cfg-if_test_defaults_xcrate"],
- test_options: {
- unit_test: true,
- },
-}
-
-rust_test {
- name: "cfg-if_device_test_tests_xcrate",
- defaults: ["cfg-if_test_defaults_xcrate"],
-}
-
rust_library {
name: "libcfg_if",
host_supported: true,
- vendor_available: true,
crate_name: "cfg_if",
cargo_env_compat: true,
cargo_pkg_version: "1.0.0",
@@ -104,5 +85,6 @@
"com.android.uwb",
"com.android.virt",
],
+ vendor_available: true,
min_sdk_version: "29",
}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 465ffc3..82ae98b 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,163 +1,123 @@
// Generated by update_crate_tests.py for tests that depend on this crate.
{
+ "imports": [
+ {
+ "path": "external/rust/crates/android_logger"
+ },
+ {
+ "path": "external/rust/crates/ash"
+ },
+ {
+ "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/env_logger"
+ },
+ {
+ "path": "external/rust/crates/futures-util"
+ },
+ {
+ "path": "external/rust/crates/gdbstub_arch"
+ },
+ {
+ "path": "external/rust/crates/getrandom"
+ },
+ {
+ "path": "external/rust/crates/jni"
+ },
+ {
+ "path": "external/rust/crates/libsqlite3-sys"
+ },
+ {
+ "path": "external/rust/crates/mio"
+ },
+ {
+ "path": "external/rust/crates/once_cell"
+ },
+ {
+ "path": "external/rust/crates/parking_lot_core"
+ },
+ {
+ "path": "external/rust/crates/quiche"
+ },
+ {
+ "path": "external/rust/crates/quickcheck"
+ },
+ {
+ "path": "external/rust/crates/rand_chacha"
+ },
+ {
+ "path": "external/rust/crates/rand_core"
+ },
+ {
+ "path": "external/rust/crates/rand_xorshift"
+ },
+ {
+ "path": "external/rust/crates/regex"
+ },
+ {
+ "path": "external/rust/crates/ryu"
+ },
+ {
+ "path": "external/rust/crates/serde-xml-rs"
+ },
+ {
+ "path": "external/rust/crates/tinytemplate"
+ },
+ {
+ "path": "external/rust/crates/tinyvec"
+ },
+ {
+ "path": "external/rust/crates/tokio"
+ },
+ {
+ "path": "external/rust/crates/tokio-test"
+ },
+ {
+ "path": "external/rust/crates/unicode-xid"
+ },
+ {
+ "path": "external/rust/crates/vulkano"
+ }
+ ],
"presubmit": [
{
"name": "ZipFuseTest"
},
{
- "name": "android_logger_device_test_src_lib"
- },
- {
- "name": "android_logger_device_test_tests_config_log_level"
- },
- {
- "name": "android_logger_device_test_tests_default_init"
- },
- {
- "name": "android_logger_device_test_tests_multiple_init"
- },
- {
"name": "apkdmverity.test"
},
{
"name": "authfs_device_test_src_lib"
},
{
- "name": "base64_device_test_tests_decode"
+ "name": "cfg-if_test_src_lib"
},
{
- "name": "base64_device_test_tests_encode"
- },
- {
- "name": "base64_device_test_tests_helpers"
- },
- {
- "name": "cfg-if_device_test_src_lib"
- },
- {
- "name": "cfg-if_device_test_tests_xcrate"
- },
- {
- "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": "cfg-if_test_tests_xcrate"
},
{
"name": "doh_unit_test"
},
{
- "name": "env_logger_device_test_src_lib"
- },
- {
- "name": "env_logger_device_test_tests_init-twice-retains-filter"
- },
- {
- "name": "env_logger_device_test_tests_log-in-log"
- },
- {
- "name": "env_logger_device_test_tests_log_tls_dtors"
- },
- {
- "name": "env_logger_device_test_tests_regexp_filter"
- },
- {
- "name": "futures-util_device_test_src_lib"
- },
- {
- "name": "gdbstub_arch_device_test_src_lib"
- },
- {
- "name": "getrandom_device_test_src_lib"
- },
- {
- "name": "getrandom_device_test_tests_custom"
- },
- {
- "name": "getrandom_device_test_tests_normal"
- },
- {
- "name": "getrandom_device_test_tests_rdrand"
- },
- {
- "name": "jni_device_test_src_lib"
- },
- {
- "name": "jni_device_test_tests_executor"
- },
- {
- "name": "jni_device_test_tests_executor_nested_attach"
- },
- {
- "name": "jni_device_test_tests_java_integers"
- },
- {
- "name": "jni_device_test_tests_jmap"
- },
- {
- "name": "jni_device_test_tests_jni_api"
- },
- {
- "name": "jni_device_test_tests_jni_global_refs"
- },
- {
- "name": "jni_device_test_tests_threads_attach_guard"
- },
- {
- "name": "jni_device_test_tests_threads_detach"
- },
- {
- "name": "jni_device_test_tests_threads_detach_daemon"
- },
- {
- "name": "jni_device_test_tests_threads_explicit_detach"
- },
- {
- "name": "jni_device_test_tests_threads_explicit_detach_daemon"
- },
- {
- "name": "jni_device_test_tests_threads_explicit_detach_permanent"
- },
- {
- "name": "jni_device_test_tests_threads_nested_attach_daemon"
- },
- {
- "name": "jni_device_test_tests_threads_nested_attach_guard"
- },
- {
- "name": "jni_device_test_tests_threads_nested_attach_permanently"
- },
- {
"name": "keystore2_crypto_test_rust"
},
{
@@ -182,259 +142,99 @@
"name": "libapkverify.test"
},
{
- "name": "libsqlite3-sys_device_test_src_lib"
- },
- {
- "name": "libsqlite3_bindgen_test"
- },
- {
- "name": "logger_device_test_config_log_level"
- },
- {
- "name": "logger_device_test_default_init"
- },
- {
- "name": "logger_device_test_env_log_level"
- },
- {
- "name": "logger_device_test_multiple_init"
- },
- {
"name": "logger_device_unit_tests"
},
{
+ "name": "logger_test_config_log_level"
+ },
+ {
+ "name": "logger_test_default_init"
+ },
+ {
+ "name": "logger_test_env_log_level"
+ },
+ {
+ "name": "logger_test_multiple_init"
+ },
+ {
"name": "microdroid_manager_test"
},
{
- "name": "parking_lot_core_device_test_src_lib"
+ "name": "open_then_run_module"
},
{
- "name": "quiche_device_test_src_lib"
+ "name": "rustBinderTest"
},
{
- "name": "rand_core_device_test_src_lib"
- },
+ "name": "virtualizationservice_device_test"
+ }
+ ],
+ "presubmit-rust": [
{
- "name": "rand_xorshift_device_test_src_lib"
+ "name": "ZipFuseTest"
},
{
- "name": "rand_xorshift_device_test_tests_mod"
+ "name": "apkdmverity.test"
},
{
- "name": "serde-xml-rs_device_test_src_lib"
+ "name": "authfs_device_test_src_lib"
},
{
- "name": "tokio-test_device_test_src_lib"
+ "name": "cfg-if_test_src_lib"
},
{
- "name": "tokio-test_device_test_tests_block_on"
+ "name": "cfg-if_test_tests_xcrate"
},
{
- "name": "tokio-test_device_test_tests_io"
+ "name": "doh_unit_test"
},
{
- "name": "tokio-test_device_test_tests_macros"
+ "name": "keystore2_crypto_test_rust"
},
{
- "name": "tokio_device_test_tests__require_full"
+ "name": "keystore2_selinux_concurrency_test"
},
{
- "name": "tokio_device_test_tests_buffered"
+ "name": "keystore2_selinux_test"
},
{
- "name": "tokio_device_test_tests_io_async_fd"
+ "name": "keystore2_test"
},
{
- "name": "tokio_device_test_tests_io_async_read"
+ "name": "keystore2_test_utils_test"
},
{
- "name": "tokio_device_test_tests_io_chain"
+ "name": "legacykeystore_test"
},
{
- "name": "tokio_device_test_tests_io_copy"
+ "name": "libapkverify.integration_test"
},
{
- "name": "tokio_device_test_tests_io_copy_bidirectional"
+ "name": "libapkverify.test"
},
{
- "name": "tokio_device_test_tests_io_driver"
+ "name": "logger_device_unit_tests"
},
{
- "name": "tokio_device_test_tests_io_driver_drop"
+ "name": "logger_test_config_log_level"
},
{
- "name": "tokio_device_test_tests_io_lines"
+ "name": "logger_test_default_init"
},
{
- "name": "tokio_device_test_tests_io_mem_stream"
+ "name": "logger_test_env_log_level"
},
{
- "name": "tokio_device_test_tests_io_read"
+ "name": "logger_test_multiple_init"
},
{
- "name": "tokio_device_test_tests_io_read_buf"
+ "name": "microdroid_manager_test"
},
{
- "name": "tokio_device_test_tests_io_read_exact"
+ "name": "open_then_run_module"
},
{
- "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": "unicode-xid_device_test_src_lib"
- },
- {
- "name": "unicode-xid_device_test_tests_exhaustive_tests"
+ "name": "rustBinderTest"
},
{
"name": "virtualizationservice_device_test"
diff --git a/cargo2android.json b/cargo2android.json
index 2c0884e..0b7433b 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -9,7 +9,7 @@
"dependencies": true,
"device": true,
"min-sdk-version": "29",
- "vendor_available": true,
"run": true,
- "tests": true
-}
+ "tests": true,
+ "vendor-available": true
+}
\ No newline at end of file
