From e107b5850e8a8dae8a234b0c8672405fd53aae99 Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Mon, 29 Nov 2021 14:03:16 -0800 Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING. Test: None Change-Id: If08410fc31facb2782caecb91860fcdcb9e22766 --- Android.bp | 42 ++----- TEST_MAPPING | 350 ++++++++++++----------------------------------------- cargo2android.json | 6 +- 3 files changed, 90 insertions(+), 308 deletions(-) diff --git a/Android.bp b/Android.bp index 799c585..61f1010 100644 --- a/Android.bp +++ b/Android.bp @@ -37,61 +37,42 @@ license { ], } -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 @@ rust_library { "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,161 +1,121 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "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": "base64_device_test_tests_encode" - }, - { - "name": "base64_device_test_tests_helpers" - }, + "imports": [ { - "name": "cfg-if_device_test_src_lib" + "path": "external/rust/crates/android_logger" }, { - "name": "cfg-if_device_test_tests_xcrate" + "path": "external/rust/crates/ash" }, { - "name": "crossbeam-epoch_device_test_src_lib" + "path": "external/rust/crates/base64" }, { - "name": "crossbeam-epoch_device_test_tests_loom" + "path": "external/rust/crates/cast" }, { - "name": "crossbeam-queue_device_test_src_lib" + "path": "external/rust/crates/crc32fast" }, { - "name": "crossbeam-queue_device_test_tests_array_queue" + "path": "external/rust/crates/crossbeam-deque" }, { - "name": "crossbeam-queue_device_test_tests_seg_queue" + "path": "external/rust/crates/crossbeam-epoch" }, { - "name": "crossbeam-utils_device_test_src_lib" + "path": "external/rust/crates/crossbeam-queue" }, { - "name": "crossbeam-utils_device_test_tests_atomic_cell" + "path": "external/rust/crates/crossbeam-utils" }, { - "name": "crossbeam-utils_device_test_tests_cache_padded" + "path": "external/rust/crates/env_logger" }, { - "name": "crossbeam-utils_device_test_tests_parker" + "path": "external/rust/crates/futures-util" }, { - "name": "crossbeam-utils_device_test_tests_sharded_lock" + "path": "external/rust/crates/gdbstub_arch" }, { - "name": "crossbeam-utils_device_test_tests_thread" + "path": "external/rust/crates/getrandom" }, { - "name": "crossbeam-utils_device_test_tests_wait_group" - }, - { - "name": "doh_unit_test" + "path": "external/rust/crates/jni" }, { - "name": "env_logger_device_test_src_lib" + "path": "external/rust/crates/libsqlite3-sys" }, { - "name": "env_logger_device_test_tests_init-twice-retains-filter" + "path": "external/rust/crates/mio" }, { - "name": "env_logger_device_test_tests_log-in-log" + "path": "external/rust/crates/once_cell" }, { - "name": "env_logger_device_test_tests_log_tls_dtors" + "path": "external/rust/crates/parking_lot_core" }, { - "name": "env_logger_device_test_tests_regexp_filter" + "path": "external/rust/crates/quiche" }, { - "name": "futures-util_device_test_src_lib" + "path": "external/rust/crates/quickcheck" }, { - "name": "gdbstub_arch_device_test_src_lib" + "path": "external/rust/crates/rand_chacha" }, { - "name": "getrandom_device_test_src_lib" + "path": "external/rust/crates/rand_core" }, { - "name": "getrandom_device_test_tests_custom" + "path": "external/rust/crates/rand_xorshift" }, { - "name": "getrandom_device_test_tests_normal" + "path": "external/rust/crates/regex" }, { - "name": "getrandom_device_test_tests_rdrand" + "path": "external/rust/crates/ryu" }, { - "name": "jni_device_test_src_lib" + "path": "external/rust/crates/serde-xml-rs" }, { - "name": "jni_device_test_tests_executor" + "path": "external/rust/crates/tinytemplate" }, { - "name": "jni_device_test_tests_executor_nested_attach" + "path": "external/rust/crates/tinyvec" }, { - "name": "jni_device_test_tests_java_integers" + "path": "external/rust/crates/tokio" }, { - "name": "jni_device_test_tests_jmap" + "path": "external/rust/crates/tokio-test" }, { - "name": "jni_device_test_tests_jni_api" + "path": "external/rust/crates/unicode-xid" }, { - "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" - }, + "path": "external/rust/crates/vulkano" + } + ], + "presubmit": [ { - "name": "jni_device_test_tests_threads_explicit_detach" + "name": "ZipFuseTest" }, { - "name": "jni_device_test_tests_threads_explicit_detach_daemon" + "name": "apkdmverity.test" }, { - "name": "jni_device_test_tests_threads_explicit_detach_permanent" + "name": "authfs_device_test_src_lib" }, { - "name": "jni_device_test_tests_threads_nested_attach_daemon" + "name": "cfg-if_test_src_lib" }, { - "name": "jni_device_test_tests_threads_nested_attach_guard" + "name": "cfg-if_test_tests_xcrate" }, { - "name": "jni_device_test_tests_threads_nested_attach_permanently" + "name": "doh_unit_test" }, { "name": "keystore2_crypto_test_rust" @@ -181,260 +141,100 @@ { "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": "microdroid_manager_test" - }, - { - "name": "parking_lot_core_device_test_src_lib" - }, - { - "name": "quiche_device_test_src_lib" - }, - { - "name": "rand_core_device_test_src_lib" - }, - { - "name": "rand_xorshift_device_test_src_lib" - }, - { - "name": "rand_xorshift_device_test_tests_mod" + "name": "logger_test_config_log_level" }, { - "name": "serde-xml-rs_device_test_src_lib" + "name": "logger_test_default_init" }, { - "name": "tokio-test_device_test_src_lib" + "name": "logger_test_env_log_level" }, { - "name": "tokio-test_device_test_tests_block_on" + "name": "logger_test_multiple_init" }, { - "name": "tokio-test_device_test_tests_io" - }, - { - "name": "tokio-test_device_test_tests_macros" - }, - { - "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": "microdroid_manager_test" }, { - "name": "tokio_device_test_tests_sync_notify" + "name": "open_then_run_module" }, { - "name": "tokio_device_test_tests_sync_oneshot" + "name": "rustBinderTest" }, { - "name": "tokio_device_test_tests_sync_rwlock" - }, + "name": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ { - "name": "tokio_device_test_tests_sync_semaphore" + "name": "ZipFuseTest" }, { - "name": "tokio_device_test_tests_sync_semaphore_owned" + "name": "apkdmverity.test" }, { - "name": "tokio_device_test_tests_sync_watch" + "name": "authfs_device_test_src_lib" }, { - "name": "tokio_device_test_tests_task_abort" + "name": "cfg-if_test_src_lib" }, { - "name": "tokio_device_test_tests_task_blocking" + "name": "cfg-if_test_tests_xcrate" }, { - "name": "tokio_device_test_tests_task_local" + "name": "doh_unit_test" }, { - "name": "tokio_device_test_tests_task_local_set" + "name": "keystore2_crypto_test_rust" }, { - "name": "tokio_device_test_tests_tcp_accept" + "name": "keystore2_selinux_concurrency_test" }, { - "name": "tokio_device_test_tests_tcp_connect" + "name": "keystore2_selinux_test" }, { - "name": "tokio_device_test_tests_tcp_echo" + "name": "keystore2_test" }, { - "name": "tokio_device_test_tests_tcp_into_split" + "name": "keystore2_test_utils_test" }, { - "name": "tokio_device_test_tests_tcp_into_std" + "name": "legacykeystore_test" }, { - "name": "tokio_device_test_tests_tcp_peek" + "name": "libapkverify.integration_test" }, { - "name": "tokio_device_test_tests_tcp_shutdown" + "name": "libapkverify.test" }, { - "name": "tokio_device_test_tests_tcp_socket" + "name": "logger_device_unit_tests" }, { - "name": "tokio_device_test_tests_tcp_split" + "name": "logger_test_config_log_level" }, { - "name": "tokio_device_test_tests_time_rt" + "name": "logger_test_default_init" }, { - "name": "tokio_device_test_tests_udp" + "name": "logger_test_env_log_level" }, { - "name": "tokio_device_test_tests_uds_cred" + "name": "logger_test_multiple_init" }, { - "name": "tokio_device_test_tests_uds_split" + "name": "microdroid_manager_test" }, { - "name": "unicode-xid_device_test_src_lib" + "name": "open_then_run_module" }, { - "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 -- cgit v1.2.3