Snap for 8006021 from 84a12a4d267411fa4a3cac53a4883653181044ee to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r18android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r20android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi

Change-Id: Ie5ef2055ab40764442a6553dec19ed8bd2e799b1

2 files changed, 15 insertions, 34 deletions

diff --git a/Android.bp b/Android.bp
index c2c3631..15ad891 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,6 +37,8 @@ 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: [
@@ -45,25 +47,3 @@ 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 dedf783..15c97a1 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,26 +1,27 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
-    {
-      "name": "doh_unit_test"
-    },
+  "imports": [
     {
-      "name": "quiche_device_test_src_lib"
+      "path": "external/rust/crates/quiche"
     },
     {
-      "name": "tinyvec_macros_device_test_src_lib"
+      "path": "external/rust/crates/tinyvec"
     },
     {
-      "name": "unicode-normalization_device_test_src_lib"
+      "path": "external/rust/crates/unicode-normalization"
     },
     {
-      "name": "url_device_test_src_lib"
-    },
+      "path": "external/rust/crates/url"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "url_device_test_tests_data"
-    },
+      "name": "doh_unit_test"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "url_device_test_tests_unit"
+      "name": "doh_unit_test"
     }
   ]
 }