Enable tests

Test: atest
x86_64 ciborium-ll_test_src_lib: Passed: 2, Failed: 0, Ignored: 0, Assumption Failed: 0,
x86_64 coset_test_src_lib: Passed: 98, Failed: 0, Ignored: 0, Assumption Failed: 0,
x86_64 libcert_request_validator_tests: Passed: 13, Failed: 0, Ignored: 0, Assumption Failed: 0,
x86_64 libkmr_derive_test: Passed: 3, Failed: 0, Ignored: 0, Assumption Failed: 0,
x86_64 libkmr_hal_test: Passed: 10, Failed: 0, Ignored: 0, Assumption Failed: 0,

Change-Id: I5d233166ab88c7ad5e62cafb2d9e7afcc3b9581b

3 files changed, 45 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index 3e7bc90..8dbce63 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,6 +18,26 @@ license {
     ],
 }
 
+rust_test {
+    name: "ciborium-ll_test_src_lib",
+    host_supported: true,
+    crate_name: "ciborium_ll",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.0",
+    srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
+    edition: "2021",
+    rustlibs: [
+        "libciborium_io",
+        "libhalf",
+        "libhex",
+    ],
+}
+
 rust_library {
     name: "libciborium_ll",
     host_supported: true,
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 2f7de78..b556475 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,13 +1,36 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/coset"
+    }
+  ],
   "presubmit": [
     {
+      "name": "ciborium-ll_test_src_lib"
+    },
+    {
       "name": "libcert_request_validator_tests"
+    },
+    {
+      "name": "libkmr_derive_test"
+    },
+    {
+      "name": "libkmr_hal_test"
     }
   ],
   "presubmit-rust": [
     {
+      "name": "ciborium-ll_test_src_lib"
+    },
+    {
       "name": "libcert_request_validator_tests"
+    },
+    {
+      "name": "libkmr_derive_test"
+    },
+    {
+      "name": "libkmr_hal_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index e256313..cf7ea4a 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -2,5 +2,6 @@
   "device": true,
   "run": true,
   "dependencies": true,
-  "vendor-available": true
+  "vendor-available": true,
+  "tests": true
 }