Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 6554698923 am: 5ba1c490b6 am: 38e03dcdd4 am: 0a17acd0a4 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/oorandom/+/1912503 Change-Id: I6bdf7c7d75395985d7bed3cb1e90b35ca06efc34

diff --git a/Android.bp b/Android.bp
index 9f9337e..68321a1 100644
--- a/Android.bp
+++ b/Android.bp

@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -22,6 +22,8 @@
     name: "liboorandom",
     host_supported: true,
     crate_name: "oorandom",
+    cargo_env_compat: true,
+    cargo_pkg_version: "11.1.3",
     srcs: ["src/lib.rs"],
     edition: "2018",
 }

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 05c6d70..3cbd48d 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING

@@ -1,20 +1,17 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
+  "imports": [
     {
-      "name": "base64_device_test_tests_decode"
+      "path": "external/rust/crates/base64"
     },
     {
-      "name": "base64_device_test_tests_encode"
+      "path": "external/rust/crates/tinytemplate"
     },
     {
-      "name": "base64_device_test_tests_helpers"
+      "path": "external/rust/crates/tinyvec"
     },
     {
-      "name": "unicode-xid_device_test_src_lib"
-    },
-    {
-      "name": "unicode-xid_device_test_tests_exhaustive_tests"
+      "path": "external/rust/crates/unicode-xid"
     }
   ]
 }

diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..bf78496
--- /dev/null
+++ b/cargo2android.json

@@ -0,0 +1,4 @@
+{
+  "device": true,
+  "run": true
+}
\ No newline at end of file