From 5e40fefc09ed8aae9509af18291a4427b656ebb7 Mon Sep 17 00:00:00 2001
From: Jeff Vander Stoep <jeffv@google.com>
Date: Thu, 7 Jul 2022 12:04:17 +0200
Subject: Enable tests

I'm not sure why this was enabled for device, but that doesn't
appear to be necessary, and doesn't really make sense to compile
proc_macros for device.

Test: atest
Change-Id: I0cf318b366778647f94e3d50493c453fbf68faa1
---
 Android.bp         | 26 ++++++++++++++++++++++++++
 TEST_MAPPING       | 18 ++++++++++++++++++
 cargo2android.json |  7 ++++---
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/Android.bp b/Android.bp
index d7a8421..ab35b60 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,4 +54,30 @@ rust_proc_macro {
         "libquote",
         "libsyn",
     ],
+    compile_multilib: "first",
+}
+
+rust_test_host {
+    name: "serde_derive_test_src_lib",
+    crate_name: "serde_derive",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.136",
+    srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
+    edition: "2015",
+    features: ["default"],
+    cfgs: [
+        "ptr_addr_of",
+        "underscore_consts",
+    ],
+    rustlibs: [
+        "libproc_macro2",
+        "libquote",
+        "libserde",
+        "libsyn",
+    ],
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
index ded2f71..07f614f 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -13,9 +13,15 @@
     {
       "path": "external/rust/crates/either"
     },
+    {
+      "path": "external/rust/crates/hashbrown"
+    },
     {
       "path": "external/rust/crates/rand_chacha"
     },
+    {
+      "path": "external/rust/crates/rusqlite"
+    },
     {
       "path": "external/rust/crates/serde"
     },
@@ -78,6 +84,12 @@
     {
       "name": "libcert_request_validator_tests"
     },
+    {
+      "name": "libkmr_common_test"
+    },
+    {
+      "name": "libkmr_derive_test"
+    },
     {
       "name": "microdroid_manager_test"
     },
@@ -119,6 +131,12 @@
     {
       "name": "libcert_request_validator_tests"
     },
+    {
+      "name": "libkmr_common_test"
+    },
+    {
+      "name": "libkmr_derive_test"
+    },
     {
       "name": "microdroid_manager_test"
     },
diff --git a/cargo2android.json b/cargo2android.json
index bf78496..c4040f0 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,4 +1,5 @@
 {
-  "device": true,
-  "run": true
-}
\ No newline at end of file
+  "host-first-multilib": true,
+  "run": true,
+  "tests": true
+}
-- 
cgit v1.2.3