diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:06:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:06:46 +0000 |
commit | fb8b9116dd159473c4773b997b1d2819d51b56c6 (patch) | |
tree | fefd5b13cb07d319668117b70d49bae569146fc3 | |
parent | b7e0af57578137d289958a90ba88a85f6b187ebd (diff) | |
parent | 03c08551c4c02e2473e4dc87332096063aaed020 (diff) | |
download | criterion-fb8b9116dd159473c4773b997b1d2819d51b56c6.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 25295f66de am: 3643ebec31 am: a627d25d8b am: 03c08551c4t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/criterion/+/1912187
Change-Id: Ida542ed3d3d790bb05fa11e78d142338b35ff503
-rw-r--r-- | Android.bp | 57 | ||||
-rw-r--r-- | TEST_MAPPING | 13 | ||||
-rw-r--r-- | cargo2android.json | 4 |
3 files changed, 13 insertions, 61 deletions
@@ -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 |