Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 7efe0cdee5

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

Change-Id: I99912eb0bc6a09231177552a2486b6d369038475

3 files changed, 51 insertions, 209 deletions

diff --git a/Android.bp b/Android.bp
index f53370e..c0dde1c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,8 +21,9 @@ license {
 rust_library {
     name: "libmemoffset",
     host_supported: true,
-    vendor_available: true,
     crate_name: "memoffset",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.6.4",
     srcs: ["src/lib.rs"],
     edition: "2015",
     features: ["default"],
@@ -38,14 +39,21 @@ rust_library {
         "com.android.compos",
         "com.android.virt",
     ],
+    vendor_available: true,
 }
 
-rust_defaults {
-    name: "memoffset_defaults",
+rust_test {
+    name: "memoffset_test_src_lib",
+    host_supported: true,
     crate_name: "memoffset",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.6.4",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2015",
     features: ["default"],
     cfgs: [
@@ -56,20 +64,3 @@ rust_defaults {
         "tuple_ty",
     ],
 }
-
-rust_test_host {
-    name: "memoffset_host_test_src_lib",
-    defaults: ["memoffset_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "memoffset_device_test_src_lib",
-    defaults: ["memoffset_defaults"],
-}
-
-// dependent_library ["feature_list"]
-//   autocfg-1.0.1
-//   doc-comment-0.3.3
diff --git a/TEST_MAPPING b/TEST_MAPPING
index aa2fb53..eceec2f 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,248 +1,99 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
-    {
-      "name": "ZipFuseTest"
-    },
-    {
-      "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": "crossbeam-epoch_device_test_src_lib"
-    },
-    {
-      "name": "crossbeam-epoch_device_test_tests_loom"
-    },
-    {
-      "name": "keystore2_crypto_test_rust"
-    },
-    {
-      "name": "keystore2_selinux_concurrency_test"
-    },
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
-      "name": "memoffset_device_test_src_lib"
-    },
-    {
-      "name": "microdroid_manager_test"
-    },
-    {
-      "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"
-    },
+  "imports": [
     {
-      "name": "tokio_device_test_tests_io_read_to_end"
+      "path": "external/rust/crates/base64"
     },
     {
-      "name": "tokio_device_test_tests_io_read_to_string"
+      "path": "external/rust/crates/crossbeam-deque"
     },
     {
-      "name": "tokio_device_test_tests_io_read_until"
+      "path": "external/rust/crates/crossbeam-epoch"
     },
     {
-      "name": "tokio_device_test_tests_io_split"
+      "path": "external/rust/crates/tinytemplate"
     },
     {
-      "name": "tokio_device_test_tests_io_take"
+      "path": "external/rust/crates/tinyvec"
     },
     {
-      "name": "tokio_device_test_tests_io_write"
+      "path": "external/rust/crates/tokio"
     },
     {
-      "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"
-    },
+      "path": "external/rust/crates/unicode-xid"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "tokio_device_test_tests_sync_rwlock"
+      "name": "ZipFuseTest"
     },
     {
-      "name": "tokio_device_test_tests_sync_semaphore"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "tokio_device_test_tests_sync_semaphore_owned"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_sync_watch"
+      "name": "keystore2_crypto_test_rust"
     },
     {
-      "name": "tokio_device_test_tests_task_abort"
+      "name": "keystore2_selinux_concurrency_test"
     },
     {
-      "name": "tokio_device_test_tests_task_blocking"
+      "name": "keystore2_test"
     },
     {
-      "name": "tokio_device_test_tests_task_local"
+      "name": "keystore2_test_utils_test"
     },
     {
-      "name": "tokio_device_test_tests_task_local_set"
+      "name": "legacykeystore_test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_accept"
+      "name": "memoffset_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_tcp_connect"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_echo"
+      "name": "open_then_run_module"
     },
     {
-      "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_crypto_test_rust"
     },
     {
-      "name": "tokio_device_test_tests_tcp_split"
+      "name": "keystore2_selinux_concurrency_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": "legacykeystore_test"
     },
     {
-      "name": "tokio_device_test_tests_uds_split"
+      "name": "memoffset_test_src_lib"
     },
     {
-      "name": "unicode-xid_device_test_src_lib"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "open_then_run_module"
     },
     {
       "name": "virtualizationservice_device_test"
diff --git a/cargo2android.json b/cargo2android.json
index f5e3478..86839da 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -5,11 +5,11 @@
     "com.android.virt"
   ],
   "dependencies": true,
-  "vendor_available": true,
   "dependency-blocklist": [
     "doc_comment"
   ],
   "device": true,
   "run": true,
-  "tests": true
-}
+  "tests": true,
+  "vendor-available": true
+}
\ No newline at end of file