diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 17:27:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 17:27:10 +0000 |
| commit | 405866219aa8711352db6f21ca4447de21993e67 (patch) | |
| tree | 4fb47bdc1cd0a28b6f9246448f17a6de5bc3b265 | |
| parent | 843f127910a506a29644ecc31eff5f12bd8e7504 (diff) | |
| parent | 8e0a429549894aa29046cb4f381039d910adb4f1 (diff) | |
| download | fallible-iterator-405866219aa8711352db6f21ca4447de21993e67.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e2825afbf7 am: 71eb938ce1 am: 8e0a429549
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fallible-iterator/+/1912453
Change-Id: Ib6a5db069c41bd6e4a8574d1e49bc85ef0111522
| -rw-r--r-- | Android.bp | 25 | ||||
| -rw-r--r-- | TEST_MAPPING | 13 | ||||
| -rw-r--r-- | cargo2android.json | 5 |
3 files changed, 29 insertions, 14 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --device --run --dependencies --tests. +// This file is generated by cargo2android.py --device --run --tests. +// Do not modify this file as changes will be overridden on upgrade. package { default_applicable_licenses: [ @@ -38,12 +39,18 @@ license { ], } -rust_defaults { - name: "fallible-iterator_defaults", +rust_test { + name: "fallible-iterator_test_src_lib", + host_supported: true, crate_name: "fallible_iterator", + cargo_env_compat: true, + cargo_pkg_version: "0.2.0", srcs: ["src/lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, + test_options: { + unit_test: true, + }, edition: "2018", features: [ "default", @@ -51,20 +58,12 @@ rust_defaults { ], } -rust_test_host { - name: "fallible-iterator_host_test_src_lib", - defaults: ["fallible-iterator_defaults"], -} - -rust_test { - name: "fallible-iterator_device_test_src_lib", - defaults: ["fallible-iterator_defaults"], -} - rust_library { name: "libfallible_iterator", host_supported: true, crate_name: "fallible_iterator", + cargo_env_compat: true, + cargo_pkg_version: "0.2.0", srcs: ["src/lib.rs"], edition: "2018", features: [ diff --git a/TEST_MAPPING b/TEST_MAPPING index 9d4d72a..9df2505 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,7 +2,18 @@ { "presubmit": [ { - "name": "fallible-iterator_device_test_src_lib" + "name": "fallible-iterator_test_src_lib" + }, + { + "name": "keystore2_test" + }, + { + "name": "legacykeystore_test" + } + ], + "presubmit-rust": [ + { + "name": "fallible-iterator_test_src_lib" }, { "name": "keystore2_test" 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 |