diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 15:28:00 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-15 15:28:00 +0000 |
commit | a1e3f6be2bc229fa3845c719e9b9420779620383 (patch) | |
tree | 1fda4d389bd9a615efad5f98bf489eb334b8a9f4 | |
parent | 15aab444ce59dd3be3a9319edf0049be48c105a4 (diff) | |
parent | 3b4de2207096916713252911571a91d74178769f (diff) | |
download | termcolor-a1e3f6be2bc229fa3845c719e9b9420779620383.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
-rw-r--r-- | Android.bp | 21 | ||||
-rw-r--r-- | TEST_MAPPING | 16 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 26 insertions, 16 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 { @@ -48,26 +48,17 @@ rust_library { edition: "2018", } -rust_defaults { - name: "termcolor_test_defaults", +rust_test { + name: "termcolor_test_src_lib", + host_supported: true, crate_name: "termcolor", - srcs: ["src/lib.rs"], cargo_env_compat: true, cargo_pkg_version: "1.1.2", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, - edition: "2018", -} - -rust_test_host { - name: "termcolor_host_test_src_lib", - defaults: ["termcolor_test_defaults"], test_options: { unit_test: true, }, -} - -rust_test { - name: "termcolor_device_test_src_lib", - defaults: ["termcolor_test_defaults"], + edition: "2018", } diff --git a/TEST_MAPPING b/TEST_MAPPING index 42044bd..8b11eb3 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -11,7 +11,21 @@ "name": "legacykeystore_test" }, { - "name": "termcolor_device_test_src_lib" + "name": "termcolor_test_src_lib" + } + ], + "presubmit-rust": [ + { + "name": "keystore2_test" + }, + { + "name": "keystore2_vintf_test" + }, + { + "name": "legacykeystore_test" + }, + { + "name": "termcolor_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 |