Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 1ed8fff4d4 am: e6e83d2b58 am: 5b52687416

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/shlex/+/1912815

Change-Id: I09003a5ca1b5f67b9daa15915afce97987dbf454

3 files changed, 16 insertions, 5 deletions

diff --git a/Android.bp b/Android.bp
index 088635a..1daa7a9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --tests.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -52,7 +52,7 @@ rust_library_host {
 }
 
 rust_test_host {
-    name: "shlex_host_test_src_lib",
+    name: "shlex_test_src_lib",
     crate_name: "shlex",
     cargo_env_compat: true,
     cargo_pkg_version: "1.1.0",
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d87563d..e4ec3b3 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,17 +1,24 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/libsqlite3-sys"
+    }
+  ],
   "presubmit": [
     {
       "name": "keystore2_test"
     },
     {
       "name": "legacykeystore_test"
-    },
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "libsqlite3-sys_device_test_src_lib"
+      "name": "keystore2_test"
     },
     {
-      "name": "libsqlite3_bindgen_test"
+      "name": "legacykeystore_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..341300b
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,4 @@
+{
+  "run": true,
+  "tests": true
+}
\ No newline at end of file