diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-12-15 16:43:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 16:43:21 +0000 |
| commit | a963a37ba9300512cd59d39ec98c2c0d97de9a9a (patch) | |
| tree | b5a4c1e3bebc9e420a0cf35ab7d96c26bed0cbfb | |
| parent | 01295d5855874a057979d8e34becbca7672448f2 (diff) | |
| parent | d23a111e0f0000631dadac139537ff8e0bfbe8f5 (diff) | |
| download | fallible-streaming-iterator-a963a37ba9300512cd59d39ec98c2c0d97de9a9a.tar.gz | |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 5649bab716 am: d23a111e0f
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fallible-streaming-iterator/+/1912190
Change-Id: Ia16bf3c32664e951cd61ba099d7fe98dbfff5946
| -rw-r--r-- | Android.bp | 24 | ||||
| -rw-r--r-- | TEST_MAPPING | 7 |
2 files changed, 6 insertions, 25 deletions
@@ -39,30 +39,6 @@ license { ], } -rust_defaults { - name: "fallible-streaming-iterator_test_defaults", - crate_name: "fallible_streaming_iterator", - // has rustc warnings - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2015", - features: ["std"], -} - -rust_test_host { - name: "fallible-streaming-iterator_host_test_src_lib", - defaults: ["fallible-streaming-iterator_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "fallible-streaming-iterator_device_test_src_lib", - defaults: ["fallible-streaming-iterator_test_defaults"], -} - rust_library { name: "libfallible_streaming_iterator", // has rustc warnings diff --git a/TEST_MAPPING b/TEST_MAPPING index 9756bc6..91f37bf 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,9 +2,14 @@ { "presubmit": [ { - "name": "fallible-streaming-iterator_device_test_src_lib" + "name": "keystore2_test" }, { + "name": "legacykeystore_test" + } + ], + "presubmit-rust": [ + { "name": "keystore2_test" }, { |