Snap for 7918267 from 50230dca9022e59185c5a56fd7e7ac65bcbd9e75 to tm-d1-release

Change-Id: I15d22c02ba6048306cca4ae4f73313f10070402b

2 files changed, 40 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index be25e60..3d4064e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device.
+// This file is generated by cargo2android.py --run --device --tests.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -37,6 +37,33 @@ license {
     ],
 }
 
+rust_defaults {
+    name: "cast_test_defaults",
+    crate_name: "cast",
+    srcs: ["src/lib.rs"],
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.3.0",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    rustlibs: [
+        "libquickcheck",
+    ],
+}
+
+rust_test_host {
+    name: "cast_host_test_src_lib",
+    defaults: ["cast_test_defaults"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "cast_device_test_src_lib",
+    defaults: ["cast_test_defaults"],
+}
+
 rust_library {
     name: "libcast",
     host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 05c6d70..4410288 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -11,6 +11,18 @@
       "name": "base64_device_test_tests_helpers"
     },
     {
+      "name": "cast_device_test_src_lib"
+    },
+    {
+      "name": "tinytemplate_device_test_src_lib"
+    },
+    {
+      "name": "tinyvec_device_test_tests_arrayvec"
+    },
+    {
+      "name": "tinyvec_device_test_tests_tinyvec"
+    },
+    {
       "name": "unicode-xid_device_test_src_lib"
     },
     {