diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:07:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:07:17 +0000 |
commit | 465e78621904030014cc9c69e3195946a8523038 (patch) | |
tree | c438d5e508594ff96dcc6763baf825c2d1c8ed86 | |
parent | be43026f3f24385641ccd0f733d7e4eef8a1ff01 (diff) | |
parent | 30a8892c5e4f6cb66dfcd4928d13c577ef9b5dba (diff) | |
download | crossbeam-deque-android13-frc-odp-release.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 42dd43a3ad am: 80ccf2ccd4 am: 7afc232835 am: 30a8892c5et_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/crossbeam-deque/+/1912435
Change-Id: Ia27e2f8300885baddbcb975705a2aac25634a813
-rw-r--r-- | Android.bp | 82 | ||||
-rw-r--r-- | TEST_MAPPING | 32 | ||||
-rw-r--r-- | cargo2android.json | 5 |
3 files changed, 39 insertions, 80 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --tests --dependencies. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -42,7 +42,6 @@ license { rust_defaults { name: "crossbeam-deque_test_defaults", crate_name: "crossbeam_deque", - srcs: ["src/lib.rs"], cargo_env_compat: true, cargo_pkg_version: "0.8.1", test_suites: ["general-tests"], @@ -56,51 +55,17 @@ rust_defaults { ], rustlibs: [ "libcfg_if", + "libcrossbeam_deque", "libcrossbeam_epoch", "libcrossbeam_utils", "librand", ], } -rust_test_host { - name: "crossbeam-deque_host_test_src_lib", - defaults: ["crossbeam-deque_test_defaults"], - test_options: { - unit_test: true, - }, -} - rust_test { - name: "crossbeam-deque_device_test_src_lib", + name: "crossbeam-deque_test_tests_fifo", defaults: ["crossbeam-deque_test_defaults"], -} - -rust_defaults { - name: "crossbeam-deque_test_defaults_crossbeam_deque", - crate_name: "crossbeam_deque", - cargo_env_compat: true, - cargo_pkg_version: "0.8.1", - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2018", - features: [ - "crossbeam-epoch", - "crossbeam-utils", - "default", - "std", - ], - rustlibs: [ - "libcfg_if", - "libcrossbeam_deque", - "libcrossbeam_epoch", - "libcrossbeam_utils", - "librand", - ], -} - -rust_test_host { - name: "crossbeam-deque_host_test_tests_fifo", - defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"], + host_supported: true, srcs: ["tests/fifo.rs"], test_options: { unit_test: true, @@ -108,14 +73,9 @@ rust_test_host { } rust_test { - name: "crossbeam-deque_device_test_tests_fifo", - defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"], - srcs: ["tests/fifo.rs"], -} - -rust_test_host { - name: "crossbeam-deque_host_test_tests_injector", - defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"], + name: "crossbeam-deque_test_tests_injector", + defaults: ["crossbeam-deque_test_defaults"], + host_supported: true, srcs: ["tests/injector.rs"], test_options: { unit_test: true, @@ -123,14 +83,9 @@ rust_test_host { } rust_test { - name: "crossbeam-deque_device_test_tests_injector", - defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"], - srcs: ["tests/injector.rs"], -} - -rust_test_host { - name: "crossbeam-deque_host_test_tests_lifo", - defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"], + name: "crossbeam-deque_test_tests_lifo", + defaults: ["crossbeam-deque_test_defaults"], + host_supported: true, srcs: ["tests/lifo.rs"], test_options: { unit_test: true, @@ -138,26 +93,15 @@ rust_test_host { } rust_test { - name: "crossbeam-deque_device_test_tests_lifo", - defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"], - srcs: ["tests/lifo.rs"], -} - -rust_test_host { - name: "crossbeam-deque_host_test_tests_steal", - defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"], + name: "crossbeam-deque_test_tests_steal", + defaults: ["crossbeam-deque_test_defaults"], + host_supported: true, srcs: ["tests/steal.rs"], test_options: { unit_test: true, }, } -rust_test { - name: "crossbeam-deque_device_test_tests_steal", - defaults: ["crossbeam-deque_test_defaults_crossbeam_deque"], - srcs: ["tests/steal.rs"], -} - rust_library { name: "libcrossbeam_deque", host_supported: true, diff --git a/TEST_MAPPING b/TEST_MAPPING index f9675a2..3601da1 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,35 +1,45 @@ // 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": "crossbeam-deque_device_test_src_lib" + "path": "external/rust/crates/unicode-xid" + } + ], + "presubmit": [ + { + "name": "crossbeam-deque_test_tests_fifo" }, { - "name": "crossbeam-deque_device_test_tests_fifo" + "name": "crossbeam-deque_test_tests_injector" }, { - "name": "crossbeam-deque_device_test_tests_injector" + "name": "crossbeam-deque_test_tests_lifo" }, { - "name": "crossbeam-deque_device_test_tests_lifo" + "name": "crossbeam-deque_test_tests_steal" + } + ], + "presubmit-rust": [ + { + "name": "crossbeam-deque_test_tests_fifo" }, { - "name": "crossbeam-deque_device_test_tests_steal" + "name": "crossbeam-deque_test_tests_injector" }, { - "name": "unicode-xid_device_test_src_lib" + "name": "crossbeam-deque_test_tests_lifo" }, { - "name": "unicode-xid_device_test_tests_exhaustive_tests" + "name": "crossbeam-deque_test_tests_steal" } ] } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..d36fb44 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,5 @@ +{ + "device": true, + "run": true, + "tests": true +}
\ No newline at end of file |