Merge "Add auto_gen_config and TEST_MAPPING." am: 9d7cf926ef am: a665ab8f12android-mainline-11.0.0_r2android-mainline-11.0.0_r1android11-dev

Change-Id: I9b71cfd4d9bd0502cb6f2505c60bec7a5057ebdf

2 files changed, 35 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 99031d1..0160e0f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py.
+// This file is generated by cargo2android.py, edited with on device tests.
+// Limitation: on device tests must be statically linked.
 
 rust_library_rlib {
     name: "libunicode_xid",
@@ -12,11 +13,30 @@ rust_library_rlib {
 }
 
 rust_test {
-    name: "unicode-xid_test_src_lib",
-    host_supported: true,
+    name: "unicode-xid_device_tests_unicode_xid",
+    crate_name: "unicode_xid",
+    srcs: ["src/lib.rs"],
+    // relative_install_path not used for device test
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2015",
+    features: [
+        "default",
+    ],
+    rlibs: [
+        "libstd.static",
+        "libtest.static",
+        "libterm.static",
+    ],
+}
+
+rust_test_host {
+    name: "unicode-xid_host_tests_unicode_xid",
     crate_name: "unicode_xid",
     srcs: ["src/lib.rs"],
-    relative_install_path: "rust/unicode-xid",
+    relative_install_path: "unicode-xid_tests",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     edition: "2015",
     features: [
         "default",
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..cbf5b0d
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,11 @@
+{
+  "presubmit": [
+    {
+      "name": "unicode-xid_device_tests_unicode_xid"
+    },
+    {
+      "name": "unicode-xid_host_tests_unicode_xid",
+      "host": true
+    }
+  ]
+}