Snap for 6047681 from fa767e12dc3157ada0c020e3bbf2228ff1f3d39b to rvc-releaseandroid-vts-11.0_r9android-vts-11.0_r8android-vts-11.0_r7android-vts-11.0_r6android-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r16android-vts-11.0_r15android-vts-11.0_r14android-vts-11.0_r13android-vts-11.0_r12android-vts-11.0_r11android-vts-11.0_r10android-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-platform-11.0.0_r2android-platform-11.0.0_r1android-cts-11.0_r9android-cts-11.0_r8android-cts-11.0_r7android-cts-11.0_r6android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r16android-cts-11.0_r15android-cts-11.0_r14android-cts-11.0_r13android-cts-11.0_r12android-cts-11.0_r11android-cts-11.0_r10android-cts-11.0_r1android-11.0.0_r6android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-release

Change-Id: I92950dab728ada611d9801819c1b9a20209d3d6e

2 files changed, 39 insertions, 11 deletions

diff --git a/Android.bp b/Android.bp
index df5e2a6..3cf41a9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,10 +20,16 @@ rust_library_host_rlib {
 }
 
 rust_test_host {
-    name: "proc-macro2_test_src_lib",
+    name: "proc-macro2_tests",
     crate_name: "proc_macro2",
-    srcs: ["src/lib.rs"],
-    relative_install_path: "rust/proc-macro2",
+    srcs: [
+        "tests/features.rs",
+        "tests/marker.rs",
+        "tests/test.rs",
+    ],
+    relative_install_path: "proc-macro2_tests",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     edition: "2018",
     features: [
         "default",
@@ -35,20 +41,19 @@ rust_test_host {
         "--cfg wrap_proc_macro",
     ],
     rlibs: [
+        "libproc_macro2",
         "libquote",
         "libunicode_xid",
     ],
 }
 
 rust_test_host {
-    name: "proc-macro2_tests_test",
+    name: "proc-macro2_tests_proc_macro2",
     crate_name: "proc_macro2",
-    srcs: [
-        "tests/features.rs",
-        "tests/marker.rs",
-        "tests/test.rs",
-    ],
-    relative_install_path: "rust/proc-macro2",
+    srcs: ["src/lib.rs"],
+    relative_install_path: "proc-macro2_tests",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     edition: "2018",
     features: [
         "default",
@@ -60,7 +65,6 @@ rust_test_host {
         "--cfg wrap_proc_macro",
     ],
     rlibs: [
-        "libproc_macro2",
         "libquote",
         "libunicode_xid",
     ],
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..acd1a0c
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,24 @@
+{
+  "presubmit": [
+    {
+      "name": "proc-macro2_tests_proc_macro2",
+      "host": true
+    },
+    {
+      "name": "proc-macro2_tests_features",
+      "host": true
+    },
+    {
+      "name": "proc-macro2_tests_marker",
+      "host": true
+    },
+    {
+      "name": "proc-macro2_tests_test",
+      "host": true
+    },
+    {
+      "name": "proc-macro2_tests_marker",
+      "host": true
+    }
+  ]
+}