Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 4d94ce0f2d am: 55f7d028b7

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/rayon-core/+/1912651

Change-Id: I91216d79e51b4a3eb89b98e1d975e222e90eb7ea

3 files changed, 12 insertions, 22 deletions

diff --git a/Android.bp b/Android.bp
index f4903cc..65b0527 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 {
@@ -41,6 +41,8 @@ rust_library {
     name: "librayon_core",
     host_supported: true,
     crate_name: "rayon_core",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.9.1",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
@@ -51,16 +53,3 @@ rust_library {
         "libnum_cpus",
     ],
 }
-
-// dependent_library ["feature_list"]
-//   autocfg-1.0.1
-//   cfg-if-1.0.0
-//   crossbeam-channel-0.5.1 "crossbeam-utils,default,std"
-//   crossbeam-deque-0.8.0 "crossbeam-epoch,crossbeam-utils,default,std"
-//   crossbeam-epoch-0.9.4 "alloc,lazy_static,std"
-//   crossbeam-utils-0.8.4 "default,lazy_static,std"
-//   lazy_static-1.4.0
-//   libc-0.2.94 "default,std"
-//   memoffset-0.6.3 "default"
-//   num_cpus-1.13.0
-//   scopeguard-1.1.0
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