Snap for 8730993 from a7b8200d042a4b6818d1a17e3a2d9586ef88c821 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: I22f3cc1591ade5cd27bfeadb73a950e60af89889

2 files changed, 24 insertions, 23 deletions

diff --git a/Android.bp b/Android.bp
index 15ad891..c2c3631 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,8 +37,6 @@ rust_library {
     name: "libtinyvec_macros",
     host_supported: true,
     crate_name: "tinyvec_macros",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.1.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
     apex_available: [
@@ -47,3 +45,25 @@ rust_library {
     ],
     min_sdk_version: "29",
 }
+
+rust_defaults {
+    name: "tinyvec_macros_defaults",
+    crate_name: "tinyvec_macros",
+    srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+}
+
+rust_test_host {
+    name: "tinyvec_macros_host_test_src_lib",
+    defaults: ["tinyvec_macros_defaults"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tinyvec_macros_device_test_src_lib",
+    defaults: ["tinyvec_macros_defaults"],
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 15c97a1..710401c 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,27 +1,8 @@
-// Generated by update_crate_tests.py for tests that depend on this crate.
+// Generated by cargo2android.py for tests in Android.bp
 {
-  "imports": [
-    {
-      "path": "external/rust/crates/quiche"
-    },
-    {
-      "path": "external/rust/crates/tinyvec"
-    },
-    {
-      "path": "external/rust/crates/unicode-normalization"
-    },
-    {
-      "path": "external/rust/crates/url"
-    }
-  ],
   "presubmit": [
     {
-      "name": "doh_unit_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "doh_unit_test"
+      "name": "tinyvec_macros_device_test_src_lib"
     }
   ]
 }