aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Vander Stoep <jeffv@google.com>2021-10-19 22:07:34 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-19 22:07:34 +0000
commitb70152acf0468a183ab8eb5a5e58debc7f216888 (patch)
tree7a8f7fec5b4041735fbb0d0439ca46b32e7a3127
parent1ae95908e2e1a9106e58344473ee91e3348ddbe0 (diff)
parentfa57f80ab4294c0f0078ff3ae5a5ad0833efc69b (diff)
downloadtinytemplate-b70152acf0468a183ab8eb5a5e58debc7f216888.tar.gz
Enable tests am: f48eb81e17 am: e306254b2f am: b357fb0625 am: 23442e021a am: fa57f80ab4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tinytemplate/+/1862867 Change-Id: I4323dc96102e8ae71c881f113b95d9bbc375d1ef
-rw-r--r--Android.bp38
-rw-r--r--TEST_MAPPING3
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
@@ -11,6 +11,9 @@
"name": "base64_device_test_tests_helpers"
},
{
+ "name": "tinytemplate_device_test_src_lib"
+ },
+ {
"name": "unicode-xid_device_test_src_lib"
},
{