From 7e2429c8c76937d043e5b6de0e070657b4251d48 Mon Sep 17 00:00:00 2001
From: Jeff Vander Stoep <jeffv@google.com>
Date: Tue, 19 Oct 2021 11:28:21 +0200
Subject: Enable tests

Test: atest
-------
x86_64 mio_host_test_src_lib: Passed: 3, Failed: 0, Ignored: 0, Assumption Failed: 0,
x86 mio_device_test_src_lib: Passed: 4, Failed: 0, Ignored: 0, Assumption Failed: 0,

Change-Id: Ic154ab9915575bcb8b907e6cd64cc68f080b98a6
---
 Android.bp         | 44 ++++++++++++++++++++++++++++++++++++++++----
 TEST_MAPPING       |  3 +++
 cargo2android.json |  5 +++--
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/Android.bp b/Android.bp
index 7d3746f..5f6b42f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,6 +22,8 @@ rust_library {
     name: "libmio",
     host_supported: true,
     crate_name: "mio",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.7.13",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
@@ -44,7 +46,41 @@ rust_library {
     min_sdk_version: "29",
 }
 
-// dependent_library ["feature_list"]
-//   cfg-if-1.0.0
-//   libc-0.2.97 "default,std"
-//   log-0.4.14 "std"
+rust_defaults {
+    name: "mio_test_defaults",
+    crate_name: "mio",
+    srcs: ["src/lib.rs"],
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.7.13",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    features: [
+        "net",
+        "os-ext",
+        "os-poll",
+        "os-util",
+        "tcp",
+        "udp",
+        "uds",
+    ],
+    rustlibs: [
+        "libenv_logger",
+        "liblibc",
+        "liblog_rust",
+        "librand",
+    ],
+}
+
+rust_test_host {
+    name: "mio_host_test_src_lib",
+    defaults: ["mio_test_defaults"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "mio_device_test_src_lib",
+    defaults: ["mio_test_defaults"],
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index ba26f45..feaeab6 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -7,6 +7,9 @@
     {
       "name": "futures-util_device_test_src_lib"
     },
+    {
+      "name": "mio_device_test_src_lib"
+    },
     {
       "name": "quiche_device_test_src_lib"
     },
diff --git a/cargo2android.json b/cargo2android.json
index 86c4a39..b2b879a 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -7,5 +7,6 @@
   "device": true,
   "features": "os-poll,tcp,udp,uds,os-util",
   "min-sdk-version": "29",
-  "run": true
-}
\ No newline at end of file
+  "run": true,
+  "tests": true
+}
-- 
cgit v1.2.3