Snap for 6050516 from d11bf65e460f0b4906d04008cd2537babd8849b5 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: Iae7bdcd263e15e7e33438b44f6d7b7fda213578f

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