From e2ebec591a096715c04ef7328208489e8bd6bb26 Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Mon, 29 Nov 2021 14:03:23 -0800
Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: Ie272f7bd33e79ab67296cd5d44c8b3edbb79ae32
---
 Android.bp         | 57 ++++--------------------------------------------------
 TEST_MAPPING       | 13 +++++--------
 cargo2android.json |  4 ++++
 3 files changed, 13 insertions(+), 61 deletions(-)
 create mode 100644 cargo2android.json

diff --git a/Android.bp b/Android.bp
index 2d9c741..f63d8a9 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 {
@@ -39,8 +39,11 @@ license {
 
 rust_library {
     name: "libcriterion",
+    // has rustc warnings
     host_supported: true,
     crate_name: "criterion",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.3.5",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
@@ -68,55 +71,3 @@ rust_library {
     ],
     proc_macros: ["libserde_derive"],
 }
-
-// dependent_library ["feature_list"]
-//   atty-0.2.14
-//   autocfg-1.0.1
-//   bitflags-1.2.1 "default"
-//   bstr-0.2.16 "default,lazy_static,regex-automata,serde,serde1,serde1-nostd,std,unicode"
-//   cast-0.2.7 "default,std"
-//   cfg-if-1.0.0
-//   clap-2.33.3
-//   criterion-plot-0.4.4
-//   crossbeam-channel-0.5.1 "crossbeam-utils,default,std"
-//   crossbeam-deque-0.8.1 "crossbeam-epoch,crossbeam-utils,default,std"
-//   crossbeam-epoch-0.9.5 "alloc,lazy_static,std"
-//   crossbeam-utils-0.8.5 "default,lazy_static,std"
-//   csv-1.1.6
-//   csv-core-0.1.10 "default"
-//   either-1.6.1
-//   half-1.7.1
-//   itertools-0.10.1 "default,use_alloc,use_std"
-//   itoa-0.4.7 "default,std"
-//   lazy_static-1.4.0
-//   libc-0.2.98 "default,std"
-//   memchr-2.4.0 "default,std"
-//   memoffset-0.6.4 "default"
-//   num-traits-0.2.14 "default,std"
-//   num_cpus-1.13.0
-//   oorandom-11.1.3
-//   plotters-0.3.1 "area_series,line_series,plotters-svg,svg_backend"
-//   plotters-backend-0.3.2
-//   plotters-svg-0.3.1
-//   proc-macro2-1.0.28 "default,proc-macro"
-//   quote-1.0.9 "default,proc-macro"
-//   rayon-1.5.1
-//   rayon-core-1.9.1
-//   regex-1.5.4 "std"
-//   regex-automata-0.1.10
-//   regex-syntax-0.6.25
-//   rustc_version-0.4.0
-//   ryu-1.0.5
-//   same-file-1.0.6
-//   scopeguard-1.1.0
-//   semver-1.0.4 "default,std"
-//   serde-1.0.127 "default,std"
-//   serde_cbor-0.11.1 "default,std"
-//   serde_derive-1.0.127 "default"
-//   serde_json-1.0.66 "default,std"
-//   syn-1.0.74 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit"
-//   textwrap-0.11.0
-//   tinytemplate-1.2.1
-//   unicode-width-0.1.8 "default"
-//   unicode-xid-0.2.2 "default"
-//   walkdir-2.3.2
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
-- 
cgit v1.2.3