Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 9776ef82a5 am: 5f7f7bb1e9

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/clang-sys/+/1912049

Change-Id: I55d7268ad52c6c90cb6560e281302131543b07fe

3 files changed, 16 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index d834ae9..54e0993 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --features=runtime,clang_10_0 --copy-out.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
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..a0f1a8e
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+  "copy-out": true,
+  "features": "runtime,clang_10_0",
+  "run": true
+}
\ No newline at end of file