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

Test: atest
-------
x86_64 tinytemplate_host_test_src_lib: Passed: 56, Failed: 0, Ignored: 0, Assumption Failed: 0,
x86 tinytemplate_device_test_src_lib: Passed: 56, Failed: 0, Ignored: 0, Assumption Failed: 0,

Change-Id: I35dd1b59b8c773d0e6868ebabbfe13286f02803d
---
 Android.bp   | 38 ++++++++++++++++++++++++++++++++------
 TEST_MAPPING |  3 +++
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/Android.bp b/Android.bp
index 290f0b5..18ab5e1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// This file is generated by cargo2android.py --run --device --dependencies --tests.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -41,6 +41,8 @@ rust_library {
     name: "libtinytemplate",
     host_supported: true,
     crate_name: "tinytemplate",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.2.1",
     srcs: ["src/lib.rs"],
     edition: "2015",
     rustlibs: [
@@ -49,8 +51,32 @@ rust_library {
     ],
 }
 
-// dependent_library ["feature_list"]
-//   itoa-0.4.7 "default,std"
-//   ryu-1.0.5
-//   serde-1.0.125 "default,std"
-//   serde_json-1.0.64 "default,std"
+rust_defaults {
+    name: "tinytemplate_test_defaults",
+    crate_name: "tinytemplate",
+    srcs: ["src/lib.rs"],
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.2.1",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2015",
+    rustlibs: [
+        "libcriterion",
+        "libserde",
+        "libserde_json",
+    ],
+    proc_macros: ["libserde_derive"],
+}
+
+rust_test_host {
+    name: "tinytemplate_host_test_src_lib",
+    defaults: ["tinytemplate_test_defaults"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "tinytemplate_device_test_src_lib",
+    defaults: ["tinytemplate_test_defaults"],
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 05c6d70..912694f 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -10,6 +10,9 @@
     {
       "name": "base64_device_test_tests_helpers"
     },
+    {
+      "name": "tinytemplate_device_test_src_lib"
+    },
     {
       "name": "unicode-xid_device_test_src_lib"
     },
-- 
cgit v1.2.3