From 706a40ab2ac1d3e5d12f9eded004f14c5532b960 Mon Sep 17 00:00:00 2001 From: Joel Galenson Date: Mon, 29 Nov 2021 14:05:31 -0800 Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING. Test: None Change-Id: Ie6bf561def6532b760783d3b39ef60084ad34dc8 --- Android.bp | 2 +- TEST_MAPPING | 348 ++++++++--------------------------------------------- cargo2android.json | 5 + 3 files changed, 59 insertions(+), 296 deletions(-) create mode 100644 cargo2android.json diff --git a/Android.bp b/Android.bp index f2a44691..a2275cfc 100644 --- a/Android.bp +++ b/Android.bp @@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --features=full,visit,visit-mut,extra-traits --features=default,full,visit,visit-mut,extra-traits --host-first-multilib. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { diff --git a/TEST_MAPPING b/TEST_MAPPING index 3f4c9c8e..09235bc4 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,116 +1,85 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ - { - "name": "ZipFuseTest" - }, + "imports": [ { - "name": "anyhow_device_test_src_lib" + "path": "external/rust/crates/anyhow" }, { - "name": "anyhow_device_test_tests_test_autotrait" + "path": "external/rust/crates/arbitrary" }, { - "name": "anyhow_device_test_tests_test_boxed" + "path": "external/rust/crates/base64" }, { - "name": "anyhow_device_test_tests_test_chain" + "path": "external/rust/crates/bitflags" }, { - "name": "anyhow_device_test_tests_test_context" + "path": "external/rust/crates/bytes" }, { - "name": "anyhow_device_test_tests_test_convert" + "path": "external/rust/crates/either" }, { - "name": "anyhow_device_test_tests_test_downcast" + "path": "external/rust/crates/futures-util" }, { - "name": "anyhow_device_test_tests_test_ffi" + "path": "external/rust/crates/jni" }, { - "name": "anyhow_device_test_tests_test_fmt" - }, - { - "name": "anyhow_device_test_tests_test_macros" - }, - { - "name": "anyhow_device_test_tests_test_repr" - }, - { - "name": "anyhow_device_test_tests_test_source" - }, - { - "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" - }, - { - "name": "doh_unit_test" + "path": "external/rust/crates/libm" }, { - "name": "either_device_test_src_lib" + "path": "external/rust/crates/oid-registry" }, { - "name": "futures-util_device_test_src_lib" + "path": "external/rust/crates/rand_chacha" }, { - "name": "jni_device_test_src_lib" + "path": "external/rust/crates/serde" }, { - "name": "jni_device_test_tests_executor" + "path": "external/rust/crates/serde-xml-rs" }, { - "name": "jni_device_test_tests_executor_nested_attach" + "path": "external/rust/crates/serde_cbor" }, { - "name": "jni_device_test_tests_java_integers" + "path": "external/rust/crates/slab" }, { - "name": "jni_device_test_tests_jmap" + "path": "external/rust/crates/tinytemplate" }, { - "name": "jni_device_test_tests_jni_api" + "path": "external/rust/crates/tinyvec" }, { - "name": "jni_device_test_tests_jni_global_refs" + "path": "external/rust/crates/tokio" }, { - "name": "jni_device_test_tests_threads_attach_guard" + "path": "external/rust/crates/tokio-test" }, { - "name": "jni_device_test_tests_threads_detach" + "path": "external/rust/crates/unicode-bidi" }, { - "name": "jni_device_test_tests_threads_detach_daemon" + "path": "external/rust/crates/unicode-xid" }, { - "name": "jni_device_test_tests_threads_explicit_detach" - }, - { - "name": "jni_device_test_tests_threads_explicit_detach_daemon" - }, + "path": "external/rust/crates/url" + } + ], + "presubmit": [ { - "name": "jni_device_test_tests_threads_explicit_detach_permanent" + "name": "ZipFuseTest" }, { - "name": "jni_device_test_tests_threads_nested_attach_daemon" + "name": "apkdmverity.test" }, { - "name": "jni_device_test_tests_threads_nested_attach_guard" + "name": "authfs_device_test_src_lib" }, { - "name": "jni_device_test_tests_threads_nested_attach_permanently" + "name": "doh_unit_test" }, { "name": "keystore2_crypto_test_rust" @@ -142,281 +111,70 @@ { "name": "libidsig.test" }, - { - "name": "libm_device_test_src_lib" - }, { "name": "microdroid_manager_test" }, { - "name": "oid-registry_device_test_src_lib" - }, - { - "name": "serde-xml-rs_device_test_src_lib" - }, - { - "name": "serde_cbor_device_test_src_lib" - }, - { - "name": "serde_cbor_device_test_tests_bennofs" - }, - { - "name": "serde_cbor_device_test_tests_canonical" - }, - { - "name": "serde_cbor_device_test_tests_de" - }, - { - "name": "serde_cbor_device_test_tests_enum" - }, - { - "name": "serde_cbor_device_test_tests_ser" - }, - { - "name": "serde_cbor_device_test_tests_std_types" - }, - { - "name": "serde_cbor_device_test_tests_tags" - }, - { - "name": "serde_cbor_device_test_tests_value" - }, - { - "name": "serde_test_device_test_src_lib" - }, - { - "name": "slab_device_test_src_lib" - }, - { - "name": "slab_device_test_tests_serde" - }, - { - "name": "slab_device_test_tests_slab" - }, - { - "name": "tokio-test_device_test_src_lib" - }, - { - "name": "tokio-test_device_test_tests_block_on" - }, - { - "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": "open_then_run_module" }, { - "name": "tokio_device_test_tests_sync_broadcast" + "name": "rustBinderTest" }, { - "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": "virtualizationservice_device_test" + } + ], + "presubmit-rust": [ { - "name": "tokio_device_test_tests_tcp_echo" + "name": "ZipFuseTest" }, { - "name": "tokio_device_test_tests_tcp_into_split" + "name": "apkdmverity.test" }, { - "name": "tokio_device_test_tests_tcp_into_std" + "name": "authfs_device_test_src_lib" }, { - "name": "tokio_device_test_tests_tcp_peek" + "name": "doh_unit_test" }, { - "name": "tokio_device_test_tests_tcp_shutdown" + "name": "keystore2_crypto_test_rust" }, { - "name": "tokio_device_test_tests_tcp_socket" + "name": "keystore2_selinux_concurrency_test" }, { - "name": "tokio_device_test_tests_tcp_split" + "name": "keystore2_selinux_test" }, { - "name": "tokio_device_test_tests_time_rt" + "name": "keystore2_test" }, { - "name": "tokio_device_test_tests_udp" + "name": "keystore2_test_utils_test" }, { - "name": "tokio_device_test_tests_uds_cred" + "name": "keystore2_vintf_test" }, { - "name": "tokio_device_test_tests_uds_split" + "name": "legacykeystore_test" }, { - "name": "unicode-bidi_device_test_src_lib" + "name": "libapkverify.integration_test" }, { - "name": "unicode-xid_device_test_src_lib" + "name": "libapkverify.test" }, { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "name": "libidsig.test" }, { - "name": "url_device_test_src_lib" + "name": "microdroid_manager_test" }, { - "name": "url_device_test_tests_data" + "name": "open_then_run_module" }, { - "name": "url_device_test_tests_unit" + "name": "rustBinderTest" }, { "name": "virtualizationservice_device_test" diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 00000000..5f9ce448 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,5 @@ +{ + "features": "default,full,visit,visit-mut,extra-traits", + "host-first-multilib": true, + "run": true +} \ No newline at end of file -- cgit v1.2.3