Upgrade rust/crates/criterion to 0.3.4 am: f82068b738 am: 808f8f824a am: 16d9d99520 am: d9e2661bbdandroid-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r97android-mainline-12.0.0_r96android-mainline-12.0.0_r95android-mainline-12.0.0_r94android-mainline-12.0.0_r93android-mainline-12.0.0_r92android-mainline-12.0.0_r91android-mainline-12.0.0_r90android-mainline-12.0.0_r9android-mainline-12.0.0_r89android-mainline-12.0.0_r88android-mainline-12.0.0_r87android-mainline-12.0.0_r86android-mainline-12.0.0_r85android-mainline-12.0.0_r84android-mainline-12.0.0_r83android-mainline-12.0.0_r82android-mainline-12.0.0_r81android-mainline-12.0.0_r80android-mainline-12.0.0_r8android-mainline-12.0.0_r79android-mainline-12.0.0_r78android-mainline-12.0.0_r77android-mainline-12.0.0_r76android-mainline-12.0.0_r75android-mainline-12.0.0_r74android-mainline-12.0.0_r73android-mainline-12.0.0_r72android-mainline-12.0.0_r71android-mainline-12.0.0_r70android-mainline-12.0.0_r7android-mainline-12.0.0_r69android-mainline-12.0.0_r68android-mainline-12.0.0_r67android-mainline-12.0.0_r66android-mainline-12.0.0_r65android-mainline-12.0.0_r64android-mainline-12.0.0_r63android-mainline-12.0.0_r62android-mainline-12.0.0_r61android-mainline-12.0.0_r60android-mainline-12.0.0_r6android-mainline-12.0.0_r59android-mainline-12.0.0_r58android-mainline-12.0.0_r57android-mainline-12.0.0_r56android-mainline-12.0.0_r53android-mainline-12.0.0_r52android-mainline-12.0.0_r51android-mainline-12.0.0_r50android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r48android-mainline-12.0.0_r47android-mainline-12.0.0_r46android-mainline-12.0.0_r45android-mainline-12.0.0_r44android-mainline-12.0.0_r43android-mainline-12.0.0_r42android-mainline-12.0.0_r41android-mainline-12.0.0_r40android-mainline-12.0.0_r39android-mainline-12.0.0_r38android-mainline-12.0.0_r37android-mainline-12.0.0_r35android-mainline-12.0.0_r34android-mainline-12.0.0_r33android-mainline-12.0.0_r32android-mainline-12.0.0_r31android-mainline-12.0.0_r30android-mainline-12.0.0_r3android-mainline-12.0.0_r29android-mainline-12.0.0_r28android-mainline-12.0.0_r27android-mainline-12.0.0_r26android-mainline-12.0.0_r25android-mainline-12.0.0_r24android-mainline-12.0.0_r23android-mainline-12.0.0_r22android-mainline-12.0.0_r21android-mainline-12.0.0_r20android-mainline-12.0.0_r2android-mainline-12.0.0_r19android-mainline-12.0.0_r18android-mainline-12.0.0_r17android-mainline-12.0.0_r16android-mainline-12.0.0_r15android-mainline-12.0.0_r14android-mainline-12.0.0_r13android-mainline-12.0.0_r126android-mainline-12.0.0_r125android-mainline-12.0.0_r124android-mainline-12.0.0_r123android-mainline-12.0.0_r122android-mainline-12.0.0_r121android-mainline-12.0.0_r120android-mainline-12.0.0_r12android-mainline-12.0.0_r119android-mainline-12.0.0_r118android-mainline-12.0.0_r117android-mainline-12.0.0_r116android-mainline-12.0.0_r115android-mainline-12.0.0_r114android-mainline-12.0.0_r113android-mainline-12.0.0_r110android-mainline-12.0.0_r11android-mainline-12.0.0_r109android-mainline-12.0.0_r108android-mainline-12.0.0_r107android-mainline-12.0.0_r106android-mainline-12.0.0_r105android-mainline-12.0.0_r104android-mainline-12.0.0_r103android-mainline-12.0.0_r102android-mainline-12.0.0_r101android-mainline-12.0.0_r100android-mainline-12.0.0_r10android-mainline-12.0.0_r1aml_wif_311811030aml_tz3_311312010aml_tet_311811050aml_sdk_311710000aml_pco_311011000aml_mpr_311911090aml_doc_310851020android12-mainline-wifi-releaseandroid12-mainline-tethering-releaseandroid12-mainline-statsd-releaseandroid12-mainline-sdkext-releaseandroid12-mainline-resolv-releaseandroid12-mainline-permission-releaseandroid12-mainline-neuralnetworks-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-mediaprovider-releaseandroid12-mainline-media-swcodec-releaseandroid12-mainline-media-releaseandroid12-mainline-ipsec-releaseandroid12-mainline-extservices-releaseandroid12-mainline-documentsui-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-cellbroadcast-releaseandroid12-mainline-captiveportallogin-releaseandroid12-mainline-art-releaseandroid12-mainline-adbd-release

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

Change-Id: I9924715bc6a341234f00034f7011b743e1abc3a7

1 files changed, 20 insertions, 14 deletions

diff --git a/Android.bp b/Android.bp
index 67e71fa..5338905 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,7 +43,10 @@ rust_library {
     crate_name: "criterion",
     srcs: ["src/lib.rs"],
     edition: "2018",
-    features: ["default"],
+    features: [
+        "cargo_bench_support",
+        "default",
+    ],
     rustlibs: [
         "libatty",
         "libcast",
@@ -71,7 +74,7 @@ rust_library {
 //   autocfg-1.0.1
 //   bitflags-1.2.1 "default"
 //   bstr-0.2.15 "default,lazy_static,regex-automata,serde,serde1,serde1-nostd,std,unicode"
-//   byteorder-1.4.2
+//   byteorder-1.4.3
 //   cast-0.2.3 "default,std"
 //   cfg-if-1.0.0
 //   clap-2.33.3
@@ -80,40 +83,43 @@ rust_library {
 //   crossbeam-deque-0.8.0 "crossbeam-epoch,crossbeam-utils,default,std"
 //   crossbeam-epoch-0.9.3 "alloc,lazy_static,std"
 //   crossbeam-utils-0.8.3 "default,lazy_static,std"
-//   csv-1.1.5
+//   csv-1.1.6
 //   csv-core-0.1.10 "default"
 //   either-1.6.1
 //   half-1.7.1
+//   itertools-0.10.0 "default,use_alloc,use_std"
 //   itertools-0.9.0 "default,use_std"
 //   itoa-0.4.7 "default,std"
 //   lazy_static-1.4.0
-//   libc-0.2.87 "default,std"
-//   memchr-2.3.4 "std,use_std"
-//   memoffset-0.6.1 "default"
+//   libc-0.2.92 "default,std"
+//   memchr-2.3.4 "default,std,use_std"
+//   memoffset-0.6.3 "default"
 //   num-traits-0.2.14 "default,std"
 //   num_cpus-1.13.0
 //   oorandom-11.1.3
-//   plotters-0.2.15 "area_series,line_series,svg"
-//   proc-macro2-1.0.24 "default,proc-macro"
+//   plotters-0.3.0 "area_series,line_series,plotters-svg,svg_backend"
+//   plotters-backend-0.3.0
+//   plotters-svg-0.3.0
+//   proc-macro2-1.0.26 "default,proc-macro"
 //   quote-1.0.9 "default,proc-macro"
 //   rayon-1.5.0
 //   rayon-core-1.9.0
-//   regex-1.4.3 "std"
+//   regex-1.4.5 "std"
 //   regex-automata-0.1.9
-//   regex-syntax-0.6.22
+//   regex-syntax-0.6.23
 //   rustc_version-0.2.3
 //   ryu-1.0.5
 //   same-file-1.0.6
 //   scopeguard-1.1.0
 //   semver-0.9.0 "default"
 //   semver-parser-0.7.0
-//   serde-1.0.123 "default,std"
+//   serde-1.0.125 "default,std"
 //   serde_cbor-0.11.1 "default,std"
-//   serde_derive-1.0.123 "default"
+//   serde_derive-1.0.125 "default"
 //   serde_json-1.0.64 "default,std"
-//   syn-1.0.61 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit"
+//   syn-1.0.68 "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.1 "default"
-//   walkdir-2.3.1
+//   walkdir-2.3.2