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

3 files changed, 60 insertions, 218 deletions

diff --git a/Android.bp b/Android.bp
index 99ace63..6bc1c19 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,15 +37,19 @@ license {
     ],
 }
 
-rust_defaults {
-    name: "bitflags_test_defaults",
-    crate_name: "bitflags",
+rust_test {
+    name: "bitflags_test_src_lib",
     // has rustc warnings
-    srcs: ["src/lib.rs"],
+    host_supported: true,
+    crate_name: "bitflags",
     cargo_env_compat: true,
     cargo_pkg_version: "1.3.2",
+    srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: ["default"],
     rustlibs: [
@@ -59,28 +63,19 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "bitflags_host_test_src_lib",
-    defaults: ["bitflags_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
 rust_test {
-    name: "bitflags_device_test_src_lib",
-    defaults: ["bitflags_test_defaults"],
-}
-
-rust_defaults {
-    name: "bitflags_test_defaults_bitflags",
-    crate_name: "bitflags",
+    name: "bitflags_test_tests_basic",
     // has rustc warnings
-    srcs: ["tests/basic.rs"],
+    host_supported: true,
+    crate_name: "bitflags",
     cargo_env_compat: true,
     cargo_pkg_version: "1.3.2",
+    srcs: ["tests/basic.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: ["default"],
     rustlibs: [
@@ -95,24 +90,10 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "bitflags_host_test_tests_basic",
-    defaults: ["bitflags_test_defaults_bitflags"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "bitflags_device_test_tests_basic",
-    defaults: ["bitflags_test_defaults_bitflags"],
-}
-
 rust_library {
     name: "libbitflags",
     // has rustc warnings
     host_supported: true,
-    vendor_available: true,
     crate_name: "bitflags",
     cargo_env_compat: true,
     cargo_pkg_version: "1.3.2",
@@ -124,4 +105,5 @@ rust_library {
         "com.android.compos",
         "com.android.virt",
     ],
+    vendor_available: true,
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 7bf985f..bb5b919 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,248 +1,108 @@
 // 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": "bitflags_device_test_src_lib"
-    },
-    {
-      "name": "keystore2_crypto_test_rust"
-    },
-    {
-      "name": "keystore2_selinux_concurrency_test"
-    },
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "legacykeystore_test"
-    },
-    {
-      "name": "libsqlite3-sys_device_test_src_lib"
-    },
+  "imports": [
     {
-      "name": "libsqlite3_bindgen_test"
+      "path": "external/rust/crates/base64"
     },
     {
-      "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"
+      "path": "external/rust/crates/libsqlite3-sys"
     },
     {
-      "name": "tokio_device_test_tests_io_read_to_end"
+      "path": "external/rust/crates/tinytemplate"
     },
     {
-      "name": "tokio_device_test_tests_io_read_to_string"
+      "path": "external/rust/crates/tinyvec"
     },
     {
-      "name": "tokio_device_test_tests_io_read_until"
+      "path": "external/rust/crates/tokio"
     },
     {
-      "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"
-    },
+      "path": "external/rust/crates/unicode-xid"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "tokio_device_test_tests_sync_mutex"
+      "name": "ZipFuseTest"
     },
     {
-      "name": "tokio_device_test_tests_sync_mutex_owned"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "tokio_device_test_tests_sync_notify"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_sync_oneshot"
+      "name": "bitflags_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_sync_rwlock"
+      "name": "bitflags_test_tests_basic"
     },
     {
-      "name": "tokio_device_test_tests_sync_semaphore"
+      "name": "keystore2_crypto_test_rust"
     },
     {
-      "name": "tokio_device_test_tests_sync_semaphore_owned"
+      "name": "keystore2_selinux_concurrency_test"
     },
     {
-      "name": "tokio_device_test_tests_sync_watch"
+      "name": "keystore2_test"
     },
     {
-      "name": "tokio_device_test_tests_task_abort"
+      "name": "keystore2_test_utils_test"
     },
     {
-      "name": "tokio_device_test_tests_task_blocking"
+      "name": "keystore2_vintf_test"
     },
     {
-      "name": "tokio_device_test_tests_task_local"
+      "name": "legacykeystore_test"
     },
     {
-      "name": "tokio_device_test_tests_task_local_set"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_accept"
+      "name": "open_then_run_module"
     },
     {
-      "name": "tokio_device_test_tests_tcp_connect"
-    },
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "tokio_device_test_tests_tcp_echo"
+      "name": "ZipFuseTest"
     },
     {
-      "name": "tokio_device_test_tests_tcp_into_split"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_into_std"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_tcp_peek"
+      "name": "bitflags_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_tcp_shutdown"
+      "name": "bitflags_test_tests_basic"
     },
     {
-      "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": "keystore2_vintf_test"
     },
     {
-      "name": "tokio_device_test_tests_uds_split"
+      "name": "legacykeystore_test"
     },
     {
-      "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 3a58854..73b0969 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -8,10 +8,10 @@
     "trybuild"
   ],
   "device": true,
-  "vendor_available": true,
   "run": true,
-  "tests": true,
   "test-blocklist": [
     "tests/compile.rs"
-  ]
-}
+  ],
+  "tests": true,
+  "vendor-available": true
+}
\ No newline at end of file