Snap for 8730993 from c82b508c1f71f9d2ffdb5a68405eb1db20eae940 to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010

Change-Id: I5ddef051e9c577864b827f6d83cc777196f1676b

3 files changed, 20 insertions, 27 deletions

diff --git a/Android.bp b/Android.bp
index 010a3be..974e876 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,5 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
-// Do not modify this file as changes will be overridden on upgrade.
+// This file is generated by cargo2android.py --run --dependencies --host-first-multilib --tests.
 
 package {
     default_applicable_licenses: [
@@ -42,8 +41,6 @@ license {
 rust_proc_macro {
     name: "libproc_macro_error_attr",
     crate_name: "proc_macro_error_attr",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.0.4",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
@@ -52,3 +49,22 @@ rust_proc_macro {
     ],
     compile_multilib: "first",
 }
+
+rust_test_host {
+    name: "proc-macro-error-attr_host_test_src_lib",
+    crate_name: "proc_macro_error_attr",
+    srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    rustlibs: [
+        "libproc_macro2",
+        "libquote",
+    ],
+}
+
+// dependent_library ["feature_list"]
+//   proc-macro2-1.0.23 "default,proc-macro"
+//   quote-1.0.7 "default,proc-macro"
+//   unicode-xid-0.2.1 "default"
+//   version_check-0.9.2
diff --git a/TEST_MAPPING b/TEST_MAPPING
deleted file mode 100644
index 8029a19..0000000
--- a/TEST_MAPPING
+++ /dev/null
@@ -1,18 +0,0 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
-{
-  "imports": [
-    {
-      "path": "external/rust/crates/base64"
-    }
-  ],
-  "presubmit": [
-    {
-      "name": "authfs_device_test_src_lib"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "authfs_device_test_src_lib"
-    }
-  ]
-}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index b360f74..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "host-first-multilib": true,
-  "run": true,
-  "tests": true
-}
\ No newline at end of file