commit a0051b306a2f13a6a2f8224c3f6c1910a27286b9
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Dec 16 02:06:58 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Dec 16 02:06:58 2021 +0000
tree b5a4c1e3bebc9e420a0cf35ab7d96c26bed0cbfb
parent bfdd9cc2c6abc870f7c12b67cb3392e7ad4efbd9
parent 724ca91d9ea29cdf152b9c579969203590a2b073

Snap for 8006021 from 724ca91d9ea29cdf152b9c579969203590a2b073 to tm-release

Change-Id: Ibdc0e1b753656e267f28d3b1fd3c00c9693366d1

Android.bp

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

TEST_MAPPING

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"
     },
     {