Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: d9afb2fc55

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/criterion-plot/+/1912003

Change-Id: I507a2d5e116e6f77ee1746114b0b924317ae5017

3 files changed, 12 insertions, 16 deletions

diff --git a/Android.bp b/Android.bp
index 97575eb..de3651a 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 {
@@ -30,6 +30,8 @@ rust_library {
     name: "libcriterion_plot",
     host_supported: true,
     crate_name: "criterion_plot",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.4.4",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
@@ -37,10 +39,3 @@ rust_library {
         "libitertools",
     ],
 }
-
-// dependent_library ["feature_list"]
-//   cast-0.2.7 "default,std"
-//   either-1.6.1
-//   itertools-0.10.1 "default,use_alloc,use_std"
-//   rustc_version-0.4.0
-//   semver-1.0.4 "default,std"
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