Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."

3 files changed, 72 insertions, 387 deletions

diff --git a/Android.bp b/Android.bp
index c29cad01..f4ff48c0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,91 +37,9 @@ license {
     ],
 }
 
-rust_defaults {
-    name: "rust_libc_test_defaults",
-    crate_name: "libc",
-    srcs: ["src/lib.rs"],
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.2.102",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2015",
-    features: [
-        "default",
-        "extra_traits",
-        "std",
-    ],
-    cfgs: [
-        "freebsd11",
-        "libc_align",
-        "libc_cfg_target_vendor",
-        "libc_const_size_of",
-        "libc_core_cvoid",
-        "libc_packedN",
-        "libc_priv_mod_use",
-        "libc_union",
-    ],
-}
-
-rust_test_host {
-    name: "libc_host_test_src_lib",
-    defaults: ["rust_libc_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "libc_device_test_src_lib",
-    defaults: ["rust_libc_test_defaults"],
-}
-
-rust_defaults {
-    name: "rust_libc_test_defaults_const_fn",
-    crate_name: "const_fn",
-    srcs: ["tests/const_fn.rs"],
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.2.102",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2015",
-    features: [
-        "default",
-        "extra_traits",
-        "std",
-    ],
-    cfgs: [
-        "freebsd11",
-        "libc_align",
-        "libc_cfg_target_vendor",
-        "libc_const_size_of",
-        "libc_core_cvoid",
-        "libc_packedN",
-        "libc_priv_mod_use",
-        "libc_union",
-    ],
-    rustlibs: [
-        "liblibc",
-    ],
-}
-
-rust_test_host {
-    name: "libc_host_test_tests_const_fn",
-    defaults: ["rust_libc_test_defaults_const_fn"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "libc_device_test_tests_const_fn",
-    defaults: ["rust_libc_test_defaults_const_fn"],
-}
-
 rust_library {
     name: "liblibc",
     host_supported: true,
-    vendor_available: true,
     crate_name: "libc",
     cargo_env_compat: true,
     cargo_pkg_version: "0.2.102",
@@ -149,5 +67,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 a053c806..ea311e8c 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,104 +1,112 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "ZipFuseTest"
+      "path": "external/rust/crates/anyhow"
     },
     {
-      "name": "anyhow_device_test_src_lib"
+      "path": "external/rust/crates/base64"
     },
     {
-      "name": "anyhow_device_test_tests_test_autotrait"
+      "path": "external/rust/crates/cast"
     },
     {
-      "name": "anyhow_device_test_tests_test_boxed"
+      "path": "external/rust/crates/crc32fast"
     },
     {
-      "name": "anyhow_device_test_tests_test_chain"
+      "path": "external/rust/crates/crossbeam-deque"
     },
     {
-      "name": "anyhow_device_test_tests_test_context"
+      "path": "external/rust/crates/crossbeam-epoch"
     },
     {
-      "name": "anyhow_device_test_tests_test_convert"
+      "path": "external/rust/crates/crossbeam-queue"
     },
     {
-      "name": "anyhow_device_test_tests_test_downcast"
+      "path": "external/rust/crates/crossbeam-utils"
     },
     {
-      "name": "anyhow_device_test_tests_test_ffi"
+      "path": "external/rust/crates/futures-util"
     },
     {
-      "name": "anyhow_device_test_tests_test_fmt"
+      "path": "external/rust/crates/getrandom"
     },
     {
-      "name": "anyhow_device_test_tests_test_macros"
+      "path": "external/rust/crates/libsqlite3-sys"
     },
     {
-      "name": "anyhow_device_test_tests_test_repr"
+      "path": "external/rust/crates/mio"
     },
     {
-      "name": "anyhow_device_test_tests_test_source"
+      "path": "external/rust/crates/num_cpus"
     },
     {
-      "name": "apkdmverity.test"
+      "path": "external/rust/crates/parking_lot_core"
     },
     {
-      "name": "authfs_device_test_src_lib"
+      "path": "external/rust/crates/quiche"
     },
     {
-      "name": "base64_device_test_tests_decode"
+      "path": "external/rust/crates/quickcheck"
     },
     {
-      "name": "base64_device_test_tests_encode"
+      "path": "external/rust/crates/rand_chacha"
     },
     {
-      "name": "base64_device_test_tests_helpers"
+      "path": "external/rust/crates/rand_core"
     },
     {
-      "name": "crossbeam-epoch_device_test_src_lib"
+      "path": "external/rust/crates/rand_xorshift"
     },
     {
-      "name": "crossbeam-epoch_device_test_tests_loom"
+      "path": "external/rust/crates/regex"
     },
     {
-      "name": "crossbeam-utils_device_test_src_lib"
+      "path": "external/rust/crates/ring"
     },
     {
-      "name": "crossbeam-utils_device_test_tests_atomic_cell"
+      "path": "external/rust/crates/ryu"
     },
     {
-      "name": "crossbeam-utils_device_test_tests_cache_padded"
+      "path": "external/rust/crates/shared_child"
     },
     {
-      "name": "crossbeam-utils_device_test_tests_parker"
+      "path": "external/rust/crates/shared_library"
     },
     {
-      "name": "crossbeam-utils_device_test_tests_sharded_lock"
+      "path": "external/rust/crates/tinytemplate"
     },
     {
-      "name": "crossbeam-utils_device_test_tests_thread"
+      "path": "external/rust/crates/tinyvec"
     },
     {
-      "name": "crossbeam-utils_device_test_tests_wait_group"
+      "path": "external/rust/crates/tokio"
     },
     {
-      "name": "doh_unit_test"
+      "path": "external/rust/crates/tokio-test"
     },
     {
-      "name": "futures-util_device_test_src_lib"
+      "path": "external/rust/crates/unicode-xid"
     },
     {
-      "name": "getrandom_device_test_src_lib"
+      "path": "external/rust/crates/vulkano"
     },
     {
-      "name": "getrandom_device_test_tests_custom"
+      "path": "external/rust/crates/webpki"
+    }
+  ],
+  "presubmit": [
+    {
+      "name": "ZipFuseTest"
     },
     {
-      "name": "getrandom_device_test_tests_normal"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "getrandom_device_test_tests_rdrand"
+      "name": "authfs_device_test_src_lib"
+    },
+    {
+      "name": "doh_unit_test"
     },
     {
       "name": "keystore2_crypto_test_rust"
@@ -113,6 +121,9 @@
       "name": "keystore2_test"
     },
     {
+      "name": "keystore2_test_utils_test"
+    },
+    {
       "name": "legacykeystore_test"
     },
     {
@@ -125,92 +136,13 @@
       "name": "libbinder_rs-internal_test"
     },
     {
-      "name": "libc_device_test_src_lib"
-    },
-    {
-      "name": "libc_device_test_tests_const_fn"
-    },
-    {
       "name": "libidsig.test"
     },
     {
-      "name": "libsqlite3-sys_device_test_src_lib"
-    },
-    {
-      "name": "libsqlite3_bindgen_test"
-    },
-    {
-      "name": "libz-sys_device_test_src_lib"
-    },
-    {
       "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": "ring_device_test_src_lib",
-      "options": [
-        {
-          "test-timeout": "100000"
-        }
-      ]
-    },
-    {
-      "name": "ring_device_test_tests_aead_tests"
-    },
-    {
-      "name": "ring_device_test_tests_agreement_tests"
-    },
-    {
-      "name": "ring_device_test_tests_constant_time_tests"
-    },
-    {
-      "name": "ring_device_test_tests_digest_tests",
-      "options": [
-        {
-          "test-timeout": "600000"
-        }
-      ]
-    },
-    {
-      "name": "ring_device_test_tests_ecdsa_tests"
-    },
-    {
-      "name": "ring_device_test_tests_ed25519_tests"
-    },
-    {
-      "name": "ring_device_test_tests_hkdf_tests"
-    },
-    {
-      "name": "ring_device_test_tests_hmac_tests"
-    },
-    {
-      "name": "ring_device_test_tests_pbkdf2_tests"
-    },
-    {
-      "name": "ring_device_test_tests_quic_tests"
-    },
-    {
-      "name": "ring_device_test_tests_rand_tests"
-    },
-    {
-      "name": "ring_device_test_tests_rsa_tests"
-    },
-    {
-      "name": "ring_device_test_tests_signature_tests"
+      "name": "open_then_run_module"
     },
     {
       "name": "rustBinderTest"
@@ -219,232 +151,66 @@
       "name": "rustBinderTestService"
     },
     {
-      "name": "shared_child_device_test_src_lib"
-    },
-    {
-      "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": "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": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "tokio_device_test_tests_task_blocking"
+      "name": "ZipFuseTest"
     },
     {
-      "name": "tokio_device_test_tests_task_local"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "tokio_device_test_tests_task_local_set"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_tcp_accept"
+      "name": "doh_unit_test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_connect"
+      "name": "keystore2_crypto_test_rust"
     },
     {
-      "name": "tokio_device_test_tests_tcp_echo"
+      "name": "keystore2_km_compat_test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_into_split"
+      "name": "keystore2_selinux_concurrency_test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_into_std"
+      "name": "keystore2_test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_peek"
+      "name": "keystore2_test_utils_test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_shutdown"
+      "name": "legacykeystore_test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_socket"
+      "name": "libapkverify.integration_test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_split"
+      "name": "libapkverify.test"
     },
     {
-      "name": "tokio_device_test_tests_time_rt"
+      "name": "libbinder_rs-internal_test"
     },
     {
-      "name": "tokio_device_test_tests_udp"
+      "name": "libidsig.test"
     },
     {
-      "name": "tokio_device_test_tests_uds_cred"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "tokio_device_test_tests_uds_split"
+      "name": "open_then_run_module"
     },
     {
-      "name": "unicode-xid_device_test_src_lib"
+      "name": "rustBinderTest"
     },
     {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "rustBinderTestService"
     },
     {
       "name": "virtualizationservice_device_test"
-    },
-    {
-      "name": "webpki_device_test_src_lib"
-    },
-    {
-      "name": "webpki_device_test_tests_dns_name_tests"
-    },
-    {
-      "name": "webpki_device_test_tests_integration"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 5d500617..73816273 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -10,7 +10,7 @@
   "device": true,
   "features": "default,extra_traits,std",
   "min-sdk-version": "29",
-  "vendor_available": true,
   "run": true,
-  "tests": true
-}
+  "tests": true,
+  "vendor-available": true
+}
\ No newline at end of file