Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e092e401eb am: d7bbc3735b am: fc794a63cc

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

Change-Id: Id1031edbc88950df009cad5e663e6e343e919aee

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 89d071b..a21e10e 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,53 +1,8 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "jni_device_test_src_lib"
-    },
-    {
-      "name": "jni_device_test_tests_executor"
-    },
-    {
-      "name": "jni_device_test_tests_executor_nested_attach"
-    },
-    {
-      "name": "jni_device_test_tests_java_integers"
-    },
-    {
-      "name": "jni_device_test_tests_jmap"
-    },
-    {
-      "name": "jni_device_test_tests_jni_api"
-    },
-    {
-      "name": "jni_device_test_tests_jni_global_refs"
-    },
-    {
-      "name": "jni_device_test_tests_threads_attach_guard"
-    },
-    {
-      "name": "jni_device_test_tests_threads_detach"
-    },
-    {
-      "name": "jni_device_test_tests_threads_detach_daemon"
-    },
-    {
-      "name": "jni_device_test_tests_threads_explicit_detach"
-    },
-    {
-      "name": "jni_device_test_tests_threads_explicit_detach_daemon"
-    },
-    {
-      "name": "jni_device_test_tests_threads_explicit_detach_permanent"
-    },
-    {
-      "name": "jni_device_test_tests_threads_nested_attach_daemon"
-    },
-    {
-      "name": "jni_device_test_tests_threads_nested_attach_guard"
-    },
-    {
-      "name": "jni_device_test_tests_threads_nested_attach_permanently"
+      "path": "external/rust/crates/jni"
     }
   ]
 }

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index 8d76784..6852966 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -4,6 +4,6 @@
     "com.android.uwb"
   ],
   "device": true,
-  "min_sdk_version": "29",
+  "min-sdk-version": "29",
   "run": true
 }
\ No newline at end of file