diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:23 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:23 +0000 |
commit | 9cc199c87c2bb25d3b5da6bddb6a8d1fe61bf3fa (patch) | |
tree | 37e64829e64fd7532ccee5a75bc46af2164dc5c2 | |
parent | 23442e021a99687112053ad8ae5531497de3c1b2 (diff) | |
parent | cc77c8f4965ad24c0bdc18cb6a7d35fa520c1db6 (diff) | |
download | tinytemplate-9cc199c87c2bb25d3b5da6bddb6a8d1fe61bf3fa.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 34b38c849f am: cc77c8f496
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tinytemplate/+/1912854
Change-Id: I724b16ec4268b685ecfba93f8a338f64c9691087
-rw-r--r-- | Android.bp | 25 | ||||
-rw-r--r-- | TEST_MAPPING | 23 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 25 insertions, 28 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --tests. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -51,14 +51,18 @@ rust_library { ], } -rust_defaults { - name: "tinytemplate_test_defaults", +rust_test { + name: "tinytemplate_test_src_lib", + host_supported: true, crate_name: "tinytemplate", - srcs: ["src/lib.rs"], cargo_env_compat: true, cargo_pkg_version: "1.2.1", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2015", rustlibs: [ "libcriterion", @@ -67,16 +71,3 @@ rust_defaults { ], 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 912694f..9a60ded 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,23 +1,24 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { - "presubmit": [ - { - "name": "base64_device_test_tests_decode" - }, + "imports": [ { - "name": "base64_device_test_tests_encode" + "path": "external/rust/crates/base64" }, { - "name": "base64_device_test_tests_helpers" + "path": "external/rust/crates/tinyvec" }, { - "name": "tinytemplate_device_test_src_lib" - }, + "path": "external/rust/crates/unicode-xid" + } + ], + "presubmit": [ { - "name": "unicode-xid_device_test_src_lib" - }, + "name": "tinytemplate_test_src_lib" + } + ], + "presubmit-rust": [ { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "name": "tinytemplate_test_src_lib" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..d36fb44 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,5 @@ +{ + "device": true, + "run": true, + "tests": true +}
\ No newline at end of file |