Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 8835cca575

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rand_core/+/1912629

Change-Id: I2a800d7657c94e237d5ab306bebbc5390c58eaf5

3 files changed, 49 insertions, 204 deletions

diff --git a/Android.bp b/Android.bp
index fbf2714..6d2506f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -60,14 +60,18 @@ rust_library {
     ],
 }
 
-rust_defaults {
-    name: "rand_core_test_defaults",
+rust_test {
+    name: "rand_core_test_src_lib",
+    host_supported: true,
     crate_name: "rand_core",
-    srcs: ["src/lib.rs"],
     cargo_env_compat: true,
     cargo_pkg_version: "0.6.3",
+    srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "alloc",
@@ -78,16 +82,3 @@ rust_defaults {
         "libgetrandom",
     ],
 }
-
-rust_test_host {
-    name: "rand_core_host_test_src_lib",
-    defaults: ["rand_core_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "rand_core_device_test_src_lib",
-    defaults: ["rand_core_test_defaults"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index e9fc98f..cd4547e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,251 +1,105 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
-    {
-      "name": "base64_device_test_tests_decode"
-    },
-    {
-      "name": "base64_device_test_tests_encode"
-    },
-    {
-      "name": "base64_device_test_tests_helpers"
-    },
-    {
-      "name": "crossbeam-epoch_device_test_src_lib"
-    },
-    {
-      "name": "crossbeam-epoch_device_test_tests_loom"
-    },
-    {
-      "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": "keystore2_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
-      "name": "rand_core_device_test_src_lib"
-    },
-    {
-      "name": "rand_xorshift_device_test_src_lib"
-    },
-    {
-      "name": "rand_xorshift_device_test_tests_mod"
-    },
-    {
-      "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"
-    },
+  "imports": [
     {
-      "name": "tokio_device_test_tests_process_kill_on_drop"
+      "path": "external/rust/crates/base64"
     },
     {
-      "name": "tokio_device_test_tests_rt_basic"
+      "path": "external/rust/crates/cast"
     },
     {
-      "name": "tokio_device_test_tests_rt_common"
+      "path": "external/rust/crates/crc32fast"
     },
     {
-      "name": "tokio_device_test_tests_rt_threaded"
+      "path": "external/rust/crates/crossbeam-deque"
     },
     {
-      "name": "tokio_device_test_tests_sync_barrier"
+      "path": "external/rust/crates/crossbeam-epoch"
     },
     {
-      "name": "tokio_device_test_tests_sync_broadcast"
+      "path": "external/rust/crates/crossbeam-queue"
     },
     {
-      "name": "tokio_device_test_tests_sync_errors"
+      "path": "external/rust/crates/crossbeam-utils"
     },
     {
-      "name": "tokio_device_test_tests_sync_mpsc"
+      "path": "external/rust/crates/mio"
     },
     {
-      "name": "tokio_device_test_tests_sync_mutex"
+      "path": "external/rust/crates/quickcheck"
     },
     {
-      "name": "tokio_device_test_tests_sync_mutex_owned"
+      "path": "external/rust/crates/rand_chacha"
     },
     {
-      "name": "tokio_device_test_tests_sync_notify"
+      "path": "external/rust/crates/rand_xorshift"
     },
     {
-      "name": "tokio_device_test_tests_sync_oneshot"
+      "path": "external/rust/crates/regex"
     },
     {
-      "name": "tokio_device_test_tests_sync_rwlock"
+      "path": "external/rust/crates/ryu"
     },
     {
-      "name": "tokio_device_test_tests_sync_semaphore"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_semaphore_owned"
-    },
+      "path": "external/rust/crates/tokio"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "tokio_device_test_tests_sync_watch"
+      "name": "ZipFuseTest"
     },
     {
-      "name": "tokio_device_test_tests_task_abort"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "tokio_device_test_tests_task_blocking"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_task_local"
+      "name": "keystore2_test"
     },
     {
-      "name": "tokio_device_test_tests_task_local_set"
+      "name": "keystore2_test_utils_test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_accept"
+      "name": "legacykeystore_test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_connect"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_echo"
+      "name": "rand_core_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_tcp_into_split"
-    },
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "tokio_device_test_tests_tcp_into_std"
+      "name": "ZipFuseTest"
     },
     {
-      "name": "tokio_device_test_tests_tcp_peek"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_shutdown"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_tcp_socket"
+      "name": "keystore2_test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_split"
+      "name": "keystore2_test_utils_test"
     },
     {
-      "name": "tokio_device_test_tests_time_rt"
+      "name": "legacykeystore_test"
     },
     {
-      "name": "tokio_device_test_tests_udp"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "tokio_device_test_tests_uds_cred"
+      "name": "rand_core_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_uds_split"
+      "name": "virtualizationservice_device_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 33c35fe..b73c7b4 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -5,7 +5,7 @@
   ],
   "dependencies": true,
   "device": true,
+  "features": "std",
   "run": true,
-  "tests": true,
-  "features": "std"
-}
+  "tests": true
+}
\ No newline at end of file