Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 699150cfbe am: aaffa4289e am: c163e91d61 am: 8b7bbeb7d0

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1912681

Change-Id: I91c962bf0785c67de9abb13cf063bfb5724f4e49

3 files changed, 66 insertions, 339 deletions

diff --git a/Android.bp b/Android.bp
index 8933a44..10cc0f6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --tests --host-first-multilib --features=default,span-locations.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -53,7 +53,6 @@ rust_library_host {
         "hygiene",
         "lexerror_display",
         "literal_from_str",
-        "proc_macro_span",
         "span_locations",
         "use_proc_macro",
         "wrap_proc_macro",
@@ -64,38 +63,6 @@ rust_library_host {
     compile_multilib: "first",
 }
 
-rust_test_host {
-    name: "proc-macro2_host_test_src_lib",
-    crate_name: "proc_macro2",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.0.29",
-    srcs: ["src/lib.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    test_options: {
-        unit_test: true,
-    },
-    edition: "2018",
-    features: [
-        "default",
-        "proc-macro",
-        "span-locations",
-    ],
-    cfgs: [
-        "hygiene",
-        "lexerror_display",
-        "literal_from_str",
-        "proc_macro_span",
-        "span_locations",
-        "use_proc_macro",
-        "wrap_proc_macro",
-    ],
-    rustlibs: [
-        "libquote",
-        "libunicode_xid",
-    ],
-}
-
 rust_defaults {
     name: "proc-macro2_test_defaults",
     crate_name: "proc_macro2",
@@ -113,7 +80,6 @@ rust_defaults {
         "hygiene",
         "lexerror_display",
         "literal_from_str",
-        "proc_macro_span",
         "span_locations",
         "use_proc_macro",
         "wrap_proc_macro",
@@ -126,7 +92,7 @@ rust_defaults {
 }
 
 rust_test_host {
-    name: "proc-macro2_host_test_tests_comments",
+    name: "proc-macro2_test_tests_comments",
     defaults: ["proc-macro2_test_defaults"],
     srcs: ["tests/comments.rs"],
     test_options: {
@@ -135,7 +101,7 @@ rust_test_host {
 }
 
 rust_test_host {
-    name: "proc-macro2_host_test_tests_features",
+    name: "proc-macro2_test_tests_features",
     defaults: ["proc-macro2_test_defaults"],
     srcs: ["tests/features.rs"],
     test_options: {
@@ -144,7 +110,7 @@ rust_test_host {
 }
 
 rust_test_host {
-    name: "proc-macro2_host_test_tests_marker",
+    name: "proc-macro2_test_tests_marker",
     defaults: ["proc-macro2_test_defaults"],
     srcs: ["tests/marker.rs"],
     test_options: {
@@ -153,7 +119,7 @@ rust_test_host {
 }
 
 rust_test_host {
-    name: "proc-macro2_host_test_tests_test",
+    name: "proc-macro2_test_tests_test",
     defaults: ["proc-macro2_test_defaults"],
     srcs: ["tests/test.rs"],
     test_options: {
@@ -162,7 +128,7 @@ rust_test_host {
 }
 
 rust_test_host {
-    name: "proc-macro2_host_test_tests_test_fmt",
+    name: "proc-macro2_test_tests_test_fmt",
     defaults: ["proc-macro2_test_defaults"],
     srcs: ["tests/test_fmt.rs"],
     test_options: {
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 28c611a..f77108a 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,116 +1,88 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
-    {
-      "name": "ZipFuseTest"
-    },
+  "imports": [
     {
-      "name": "anyhow_device_test_src_lib"
+      "path": "external/rust/crates/anyhow"
     },
     {
-      "name": "anyhow_device_test_tests_test_autotrait"
+      "path": "external/rust/crates/arbitrary"
     },
     {
-      "name": "anyhow_device_test_tests_test_boxed"
+      "path": "external/rust/crates/base64"
     },
     {
-      "name": "anyhow_device_test_tests_test_chain"
+      "path": "external/rust/crates/bitflags"
     },
     {
-      "name": "anyhow_device_test_tests_test_context"
+      "path": "external/rust/crates/bytes"
     },
     {
-      "name": "anyhow_device_test_tests_test_convert"
+      "path": "external/rust/crates/either"
     },
     {
-      "name": "anyhow_device_test_tests_test_downcast"
+      "path": "external/rust/crates/futures-util"
     },
     {
-      "name": "anyhow_device_test_tests_test_ffi"
+      "path": "external/rust/crates/jni"
     },
     {
-      "name": "anyhow_device_test_tests_test_fmt"
-    },
-    {
-      "name": "anyhow_device_test_tests_test_macros"
-    },
-    {
-      "name": "anyhow_device_test_tests_test_repr"
-    },
-    {
-      "name": "anyhow_device_test_tests_test_source"
-    },
-    {
-      "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": "doh_unit_test"
+      "path": "external/rust/crates/libm"
     },
     {
-      "name": "either_device_test_src_lib"
+      "path": "external/rust/crates/libsqlite3-sys"
     },
     {
-      "name": "futures-util_device_test_src_lib"
+      "path": "external/rust/crates/oid-registry"
     },
     {
-      "name": "jni_device_test_src_lib"
+      "path": "external/rust/crates/rand_chacha"
     },
     {
-      "name": "jni_device_test_tests_executor"
+      "path": "external/rust/crates/serde"
     },
     {
-      "name": "jni_device_test_tests_executor_nested_attach"
+      "path": "external/rust/crates/serde-xml-rs"
     },
     {
-      "name": "jni_device_test_tests_java_integers"
+      "path": "external/rust/crates/serde_cbor"
     },
     {
-      "name": "jni_device_test_tests_jmap"
+      "path": "external/rust/crates/slab"
     },
     {
-      "name": "jni_device_test_tests_jni_api"
+      "path": "external/rust/crates/tinytemplate"
     },
     {
-      "name": "jni_device_test_tests_jni_global_refs"
+      "path": "external/rust/crates/tinyvec"
     },
     {
-      "name": "jni_device_test_tests_threads_attach_guard"
+      "path": "external/rust/crates/tokio"
     },
     {
-      "name": "jni_device_test_tests_threads_detach"
+      "path": "external/rust/crates/tokio-test"
     },
     {
-      "name": "jni_device_test_tests_threads_detach_daemon"
+      "path": "external/rust/crates/unicode-bidi"
     },
     {
-      "name": "jni_device_test_tests_threads_explicit_detach"
+      "path": "external/rust/crates/unicode-xid"
     },
     {
-      "name": "jni_device_test_tests_threads_explicit_detach_daemon"
-    },
+      "path": "external/rust/crates/url"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "jni_device_test_tests_threads_explicit_detach_permanent"
+      "name": "ZipFuseTest"
     },
     {
-      "name": "jni_device_test_tests_threads_nested_attach_daemon"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "jni_device_test_tests_threads_nested_attach_guard"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "jni_device_test_tests_threads_nested_attach_permanently"
+      "name": "doh_unit_test"
     },
     {
       "name": "keystore2_crypto_test_rust"
@@ -143,286 +115,69 @@
       "name": "libidsig.test"
     },
     {
-      "name": "libm_device_test_src_lib"
-    },
-    {
-      "name": "libsqlite3-sys_device_test_src_lib"
-    },
-    {
-      "name": "libsqlite3_bindgen_test"
-    },
-    {
       "name": "microdroid_manager_test"
     },
     {
-      "name": "oid-registry_device_test_src_lib"
-    },
-    {
-      "name": "serde-xml-rs_device_test_src_lib"
-    },
-    {
-      "name": "serde_cbor_device_test_src_lib"
-    },
-    {
-      "name": "serde_cbor_device_test_tests_bennofs"
-    },
-    {
-      "name": "serde_cbor_device_test_tests_canonical"
-    },
-    {
-      "name": "serde_cbor_device_test_tests_de"
-    },
-    {
-      "name": "serde_cbor_device_test_tests_enum"
-    },
-    {
-      "name": "serde_cbor_device_test_tests_ser"
-    },
-    {
-      "name": "serde_cbor_device_test_tests_std_types"
-    },
-    {
-      "name": "serde_cbor_device_test_tests_tags"
-    },
-    {
-      "name": "serde_cbor_device_test_tests_value"
-    },
-    {
-      "name": "serde_test_device_test_src_lib"
-    },
-    {
-      "name": "slab_device_test_src_lib"
-    },
-    {
-      "name": "slab_device_test_tests_serde"
-    },
-    {
-      "name": "slab_device_test_tests_slab"
-    },
-    {
-      "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": "open_then_run_module"
     },
     {
-      "name": "tokio_device_test_tests_io_read_buf"
+      "name": "rustBinderTest"
     },
     {
-      "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": "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": "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": "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": "doh_unit_test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_shutdown"
+      "name": "keystore2_crypto_test_rust"
     },
     {
-      "name": "tokio_device_test_tests_tcp_socket"
+      "name": "keystore2_selinux_concurrency_test"
     },
     {
-      "name": "tokio_device_test_tests_tcp_split"
+      "name": "keystore2_selinux_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-bidi_device_test_src_lib"
+      "name": "libapkverify.integration_test"
     },
     {
-      "name": "unicode-xid_device_test_src_lib"
+      "name": "libapkverify.test"
     },
     {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "name": "libidsig.test"
     },
     {
-      "name": "url_device_test_src_lib"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "url_device_test_tests_data"
+      "name": "open_then_run_module"
     },
     {
-      "name": "url_device_test_tests_unit"
+      "name": "rustBinderTest"
     },
     {
       "name": "virtualizationservice_device_test"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..45a2954
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,6 @@
+{
+  "features": "default,span-locations",
+  "host-first-multilib": true,
+  "run": true,
+  "tests": true
+}
\ No newline at end of file