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

4 files changed, 46 insertions, 245 deletions

diff --git a/Android.bp b/Android.bp
index 1e5f5be..2c74b84 100644
--- a/Android.bp
+++ b/Android.bp
@@ -57,12 +57,12 @@ rust_library {
     min_sdk_version: "29",
 }
 
-rust_defaults {
-    name: "num_cpus_test_defaults",
+rust_test {
+    name: "num_cpus_test_src_lib",
     crate_name: "num_cpus",
-    srcs: ["src/lib.rs"],
     cargo_env_compat: true,
     cargo_pkg_version: "1.13.0",
+    srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2015",
@@ -70,8 +70,3 @@ rust_defaults {
         "liblibc",
     ],
 }
-
-rust_test {
-    name: "num_cpus_device_test_src_lib",
-    defaults: ["num_cpus_test_defaults"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index b91cf8a..45ba394 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,275 +1,78 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
-    {
-      "name": "anyhow_device_test_src_lib"
-    },
-    {
-      "name": "anyhow_device_test_tests_test_autotrait"
-    },
-    {
-      "name": "anyhow_device_test_tests_test_boxed"
-    },
-    {
-      "name": "anyhow_device_test_tests_test_chain"
-    },
+  "imports": [
     {
-      "name": "anyhow_device_test_tests_test_context"
+      "path": "external/rust/crates/anyhow"
     },
     {
-      "name": "anyhow_device_test_tests_test_convert"
+      "path": "external/rust/crates/base64"
     },
     {
-      "name": "anyhow_device_test_tests_test_downcast"
+      "path": "external/rust/crates/futures-util"
     },
     {
-      "name": "anyhow_device_test_tests_test_ffi"
+      "path": "external/rust/crates/ryu"
     },
     {
-      "name": "anyhow_device_test_tests_test_fmt"
+      "path": "external/rust/crates/tinytemplate"
     },
     {
-      "name": "anyhow_device_test_tests_test_macros"
+      "path": "external/rust/crates/tinyvec"
     },
     {
-      "name": "anyhow_device_test_tests_test_repr"
+      "path": "external/rust/crates/tokio"
     },
     {
-      "name": "anyhow_device_test_tests_test_source"
+      "path": "external/rust/crates/tokio-test"
     },
     {
-      "name": "base64_device_test_tests_decode"
-    },
+      "path": "external/rust/crates/unicode-xid"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "base64_device_test_tests_encode"
+      "name": "ZipFuseTest"
     },
     {
-      "name": "base64_device_test_tests_helpers"
+      "name": "authfs_device_test_src_lib"
     },
     {
       "name": "doh_unit_test"
     },
     {
-      "name": "futures-util_device_test_src_lib"
-    },
-    {
       "name": "keystore2_selinux_concurrency_test"
     },
     {
-      "name": "num_cpus_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": "num_cpus_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_sync_errors"
+      "name": "rustBinderTest"
     },
     {
-      "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": "tokio_device_test_tests_tcp_echo"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_into_split"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_into_std"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_peek"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_shutdown"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_socket"
-    },
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "tokio_device_test_tests_tcp_split"
+      "name": "ZipFuseTest"
     },
     {
-      "name": "tokio_device_test_tests_time_rt"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_udp"
+      "name": "doh_unit_test"
     },
     {
-      "name": "tokio_device_test_tests_uds_cred"
+      "name": "keystore2_selinux_concurrency_test"
     },
     {
-      "name": "tokio_device_test_tests_uds_split"
+      "name": "num_cpus_test_src_lib"
     },
     {
-      "name": "unicode-xid_device_test_src_lib"
+      "name": "rustBinderTest"
     },
     {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "virtualizationservice_device_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 25aec93..3412a64 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -5,9 +5,10 @@
     "com.android.uwb",
     "com.android.virt"
   ],
-  "min_sdk_version": "29",
   "dependencies": true,
   "device": true,
+  "min-sdk-version": "29",
+  "patch": "patches/Android.bp.patch",
   "run": true,
   "tests": true
 }
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
index cb85884..72eef69 100644
--- a/patches/Android.bp.patch
+++ b/patches/Android.bp.patch
@@ -2,18 +2,20 @@ diff --git a/Android.bp b/Android.bp
 index a441683..8f89a16 100644
 --- a/Android.bp
 +++ b/Android.bp
-@@ -70,14 +70,6 @@ rust_defaults {
-     ],
- }
+@@ -59,16 +59,12 @@ rust_library {
  
--rust_test_host {
--    name: "num_cpus_host_test_src_lib",
--    defaults: ["num_cpus_test_defaults"],
+ rust_test {
+     name: "num_cpus_test_src_lib",
+-    host_supported: true,
+     crate_name: "num_cpus",
+     cargo_env_compat: true,
+     cargo_pkg_version: "1.13.0",
+     srcs: ["src/lib.rs"],
+     test_suites: ["general-tests"],
+     auto_gen_config: true,
 -    test_options: {
 -        unit_test: true,
 -    },
--}
--
- rust_test {
-     name: "num_cpus_device_test_src_lib",
-     defaults: ["num_cpus_test_defaults"],
+     edition: "2015",
+     rustlibs: [
+         "liblibc",