Merge "Add auto_gen_config and TEST_MAPPING." am: 8659e0009c am: d3e41e5eb0android-mainline-11.0.0_r2android-mainline-11.0.0_r1android11-dev

Change-Id: Ic94df1ae3fbad03e7b67e39f14b7322b899e98b3

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
+    }
+  ]
+}