diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-11-29 14:04:37 -0800 |
|---|---|---|
| committer | Joel Galenson <jgalenson@google.com> | 2021-12-10 15:33:08 -0800 |
| commit | 972ae58c4ed72ed9ac3f4c78990b5e6235ad2950 (patch) | |
| tree | 3547624fc1bb0a71350ed06a100ae37654e76022 | |
| parent | 37c69af11a17e800be5a4372f012dd851d516d7e (diff) | |
| download | peeking_take_while-972ae58c4ed72ed9ac3f4c78990b5e6235ad2950.tar.gz | |
Refresh Android.bp, cargo2android.json, TEST_MAPPING.
Test: None
Change-Id: I0a0378fa825d50d49fb637af2e1b16cf8e920f5e
| -rw-r--r-- | Android.bp | 23 | ||||
| -rw-r--r-- | TEST_MAPPING | 13 | ||||
| -rw-r--r-- | cargo2android.json | 5 |
3 files changed, 24 insertions, 17 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --device --tests. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -50,27 +50,18 @@ rust_library { edition: "2018", } -rust_defaults { - name: "peeking_take_while_test_defaults", - crate_name: "peeking_take_while", +rust_test { + name: "peeking_take_while_test_src_lib", // has rustc warnings - srcs: ["src/lib.rs"], + host_supported: true, + crate_name: "peeking_take_while", cargo_env_compat: true, cargo_pkg_version: "1.0.0", + srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, - edition: "2018", -} - -rust_test_host { - name: "peeking_take_while_host_test_src_lib", - defaults: ["peeking_take_while_test_defaults"], test_options: { unit_test: true, }, -} - -rust_test { - name: "peeking_take_while_device_test_src_lib", - defaults: ["peeking_take_while_test_defaults"], + edition: "2018", } diff --git a/TEST_MAPPING b/TEST_MAPPING index d23e52b..f9ce301 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -13,7 +13,18 @@ "name": "legacykeystore_test" }, { - "name": "peeking_take_while_device_test_src_lib" + "name": "peeking_take_while_test_src_lib" + } + ], + "presubmit-rust": [ + { + "name": "keystore2_test" + }, + { + "name": "legacykeystore_test" + }, + { + "name": "peeking_take_while_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 |