Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: be00578079 am: 58d9e9909d am: 24579ad6fa am: 51fc38d2fd

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

Change-Id: I55d64c11e0a16517417ae73a1e041c3bbb320424

3 files changed, 71 insertions, 364 deletions

diff --git a/Android.bp b/Android.bp
index be6d9b5..2b73884 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,37 +21,6 @@ license {
 rust_defaults {
     name: "bytes_test_defaults",
     crate_name: "bytes",
-    srcs: ["src/lib.rs"],
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.1.0",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2018",
-    features: [
-        "default",
-        "std",
-    ],
-    rustlibs: [
-        "libserde_test",
-    ],
-}
-
-rust_test_host {
-    name: "bytes_host_test_src_lib",
-    defaults: ["bytes_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "bytes_device_test_src_lib",
-    defaults: ["bytes_test_defaults"],
-}
-
-rust_defaults {
-    name: "bytes_test_defaults_bytes",
-    crate_name: "bytes",
     cargo_env_compat: true,
     cargo_pkg_version: "1.1.0",
     test_suites: ["general-tests"],
@@ -67,171 +36,106 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "bytes_host_test_tests_test_buf",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_buf.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
 rust_test {
-    name: "bytes_device_test_tests_test_buf",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_buf",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_buf.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_buf_mut",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_buf_mut.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "bytes_device_test_tests_test_buf_mut",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_buf_mut",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_buf_mut.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_bytes",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_bytes.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "bytes_device_test_tests_test_bytes",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_bytes",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_bytes.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_bytes_odd_alloc",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_bytes_odd_alloc.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "bytes_device_test_tests_test_bytes_odd_alloc",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_bytes_odd_alloc",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_bytes_odd_alloc.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_bytes_vec_alloc",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_bytes_vec_alloc.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "bytes_device_test_tests_test_bytes_vec_alloc",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_bytes_vec_alloc",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_bytes_vec_alloc.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_chain",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_chain.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "bytes_device_test_tests_test_chain",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_chain",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_chain.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_debug",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_debug.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "bytes_device_test_tests_test_debug",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_debug",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_debug.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_iter",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_iter.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "bytes_device_test_tests_test_iter",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_iter",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_iter.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_reader",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_reader.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "bytes_device_test_tests_test_reader",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_reader",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_reader.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_serde",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_serde.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
 rust_test {
-    name: "bytes_device_test_tests_test_serde",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_serde.rs"],
-}
-
-rust_test_host {
-    name: "bytes_host_test_tests_test_take",
-    defaults: ["bytes_test_defaults_bytes"],
+    name: "bytes_test_tests_test_take",
+    defaults: ["bytes_test_defaults"],
+    host_supported: true,
     srcs: ["tests/test_take.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
-rust_test {
-    name: "bytes_device_test_tests_test_take",
-    defaults: ["bytes_test_defaults_bytes"],
-    srcs: ["tests/test_take.rs"],
-}
-
 rust_library {
     name: "libbytes",
     host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index bb4019d..b9e481c 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,95 +1,52 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
-    {
-      "name": "bytes_device_test_src_lib"
-    },
-    {
-      "name": "bytes_device_test_tests_test_buf"
-    },
-    {
-      "name": "bytes_device_test_tests_test_buf_mut"
-    },
-    {
-      "name": "bytes_device_test_tests_test_bytes"
-    },
-    {
-      "name": "bytes_device_test_tests_test_bytes_odd_alloc"
-    },
-    {
-      "name": "bytes_device_test_tests_test_bytes_vec_alloc"
-    },
-    {
-      "name": "bytes_device_test_tests_test_chain"
-    },
-    {
-      "name": "bytes_device_test_tests_test_debug"
-    },
-    {
-      "name": "bytes_device_test_tests_test_iter"
-    },
+  "imports": [
     {
-      "name": "bytes_device_test_tests_test_reader"
+      "path": "external/rust/crates/futures-util"
     },
     {
-      "name": "bytes_device_test_tests_test_serde"
+      "path": "external/rust/crates/jni"
     },
     {
-      "name": "bytes_device_test_tests_test_take"
+      "path": "external/rust/crates/tokio"
     },
     {
-      "name": "doh_unit_test"
-    },
-    {
-      "name": "futures-util_device_test_src_lib"
-    },
-    {
-      "name": "jni_device_test_src_lib"
-    },
-    {
-      "name": "jni_device_test_tests_executor"
-    },
-    {
-      "name": "jni_device_test_tests_executor_nested_attach"
-    },
-    {
-      "name": "jni_device_test_tests_java_integers"
-    },
-    {
-      "name": "jni_device_test_tests_jmap"
-    },
+      "path": "external/rust/crates/tokio-test"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "jni_device_test_tests_jni_api"
+      "name": "bytes_test_tests_test_buf"
     },
     {
-      "name": "jni_device_test_tests_jni_global_refs"
+      "name": "bytes_test_tests_test_buf_mut"
     },
     {
-      "name": "jni_device_test_tests_threads_attach_guard"
+      "name": "bytes_test_tests_test_bytes"
     },
     {
-      "name": "jni_device_test_tests_threads_detach"
+      "name": "bytes_test_tests_test_bytes_odd_alloc"
     },
     {
-      "name": "jni_device_test_tests_threads_detach_daemon"
+      "name": "bytes_test_tests_test_bytes_vec_alloc"
     },
     {
-      "name": "jni_device_test_tests_threads_explicit_detach"
+      "name": "bytes_test_tests_test_chain"
     },
     {
-      "name": "jni_device_test_tests_threads_explicit_detach_daemon"
+      "name": "bytes_test_tests_test_debug"
     },
     {
-      "name": "jni_device_test_tests_threads_explicit_detach_permanent"
+      "name": "bytes_test_tests_test_iter"
     },
     {
-      "name": "jni_device_test_tests_threads_nested_attach_daemon"
+      "name": "bytes_test_tests_test_reader"
     },
     {
-      "name": "jni_device_test_tests_threads_nested_attach_guard"
+      "name": "bytes_test_tests_test_take"
     },
     {
-      "name": "jni_device_test_tests_threads_nested_attach_permanently"
+      "name": "doh_unit_test"
     },
     {
       "name": "libapkverify.integration_test"
@@ -101,211 +58,57 @@
       "name": "microdroid_manager_test"
     },
     {
-      "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": "rustBinderTest"
     },
     {
-      "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": "tokio_device_test_tests_task_blocking"
-    },
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "tokio_device_test_tests_task_local"
+      "name": "bytes_test_tests_test_buf"
     },
     {
-      "name": "tokio_device_test_tests_task_local_set"
+      "name": "bytes_test_tests_test_buf_mut"
     },
     {
-      "name": "tokio_device_test_tests_tcp_accept"
+      "name": "bytes_test_tests_test_bytes"
     },
     {
-      "name": "tokio_device_test_tests_tcp_connect"
+      "name": "bytes_test_tests_test_bytes_odd_alloc"
     },
     {
-      "name": "tokio_device_test_tests_tcp_echo"
+      "name": "bytes_test_tests_test_bytes_vec_alloc"
     },
     {
-      "name": "tokio_device_test_tests_tcp_into_split"
+      "name": "bytes_test_tests_test_chain"
     },
     {
-      "name": "tokio_device_test_tests_tcp_into_std"
+      "name": "bytes_test_tests_test_debug"
     },
     {
-      "name": "tokio_device_test_tests_tcp_peek"
+      "name": "bytes_test_tests_test_iter"
     },
     {
-      "name": "tokio_device_test_tests_tcp_shutdown"
+      "name": "bytes_test_tests_test_reader"
     },
     {
-      "name": "tokio_device_test_tests_tcp_socket"
+      "name": "bytes_test_tests_test_take"
     },
     {
-      "name": "tokio_device_test_tests_tcp_split"
+      "name": "doh_unit_test"
     },
     {
-      "name": "tokio_device_test_tests_time_rt"
+      "name": "libapkverify.integration_test"
     },
     {
-      "name": "tokio_device_test_tests_udp"
+      "name": "libapkverify.test"
     },
     {
-      "name": "tokio_device_test_tests_uds_cred"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "tokio_device_test_tests_uds_split"
+      "name": "rustBinderTest"
     },
     {
       "name": "virtualizationservice_device_test"
diff --git a/cargo2android.json b/cargo2android.json
index ab9dbd8..79cdb2e 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -6,9 +6,9 @@
     "com.android.uwb",
     "com.android.virt"
   ],
-  "min_sdk_version": "29",
   "dependencies": true,
   "device": true,
+  "min-sdk-version": "29",
   "run": true,
   "tests": true
-}
+}
\ No newline at end of file