Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 5649bab716 am: d23a111e0f am: a963a37ba9 am: ad2503f6dd
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/fallible-streaming-iterator/+/1912190
Change-Id: Ic87f1dfc39f6bf6454db9806f035f1e39e532bf8
diff --git a/Android.bp b/Android.bp
index 5edfe0d..3e1e487 100644
--- a/Android.bp
+++ b/Android.bp
@@ -39,30 +39,6 @@
],
}
-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"
},
{
