diff options
author | Joel Galenson <jgalenson@google.com> | 2021-12-15 18:07:08 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-15 18:07:08 +0000 |
commit | 685133a9cf208b8c92f7d024096afef20ec816c9 (patch) | |
tree | d361da931e8c52ac15db3459546733dea4d562b9 | |
parent | 85f72a1f22589b89fc52eaf3088a05d421cd86e8 (diff) | |
parent | 676c379a13c3ad8528eeb93e3246e77226f51a7b (diff) | |
download | matches-aml_go_wif_330911000.tar.gz |
Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 733e7baa10 am: b07611c07c am: 3c9932ff16 am: 676c379a13t_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/matches/+/1912500
Change-Id: I56f3be0e3895e2121f27dba4d696363912c940ab
-rw-r--r-- | Android.bp | 49 | ||||
-rw-r--r-- | TEST_MAPPING | 26 |
2 files changed, 32 insertions, 43 deletions
@@ -34,33 +34,24 @@ rust_library { min_sdk_version: "29", } -rust_defaults { - name: "matches_test_defaults", - crate_name: "matches", +rust_test { + name: "matches_test_lib", // has rustc warnings - srcs: ["lib.rs"], + host_supported: true, + crate_name: "matches", cargo_env_compat: true, cargo_pkg_version: "0.1.9", + srcs: ["lib.rs"], test_suites: ["general-tests"], auto_gen_config: true, - edition: "2015", -} - -rust_test_host { - name: "matches_host_test_lib", - defaults: ["matches_test_defaults"], test_options: { unit_test: true, }, -} - -rust_test { - name: "matches_device_test_lib", - defaults: ["matches_test_defaults"], + edition: "2015", } rust_defaults { - name: "matches_test_defaults_matches", + name: "matches_test_defaults", crate_name: "matches", cargo_env_compat: true, cargo_pkg_version: "0.1.9", @@ -72,10 +63,11 @@ rust_defaults { ], } -rust_test_host { - name: "matches_host_test_tests_macro_use_one", - defaults: ["matches_test_defaults_matches"], +rust_test { + name: "matches_test_tests_macro_use_one", + defaults: ["matches_test_defaults"], // has rustc warnings + host_supported: true, srcs: ["tests/macro_use_one.rs"], test_options: { unit_test: true, @@ -83,25 +75,12 @@ rust_test_host { } rust_test { - name: "matches_device_test_tests_macro_use_one", - defaults: ["matches_test_defaults_matches"], - // has rustc warnings - srcs: ["tests/macro_use_one.rs"], -} - -rust_test_host { - name: "matches_host_test_tests_use_star", - defaults: ["matches_test_defaults_matches"], + name: "matches_test_tests_use_star", + defaults: ["matches_test_defaults"], // has rustc warnings + host_supported: true, srcs: ["tests/use_star.rs"], test_options: { unit_test: true, }, } - -rust_test { - name: "matches_device_test_tests_use_star", - defaults: ["matches_test_defaults_matches"], - // has rustc warnings - srcs: ["tests/use_star.rs"], -} diff --git a/TEST_MAPPING b/TEST_MAPPING index 798b57b..577d626 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,29 +1,39 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/quiche" + }, + { + "path": "external/rust/crates/url" + } + ], "presubmit": [ { "name": "doh_unit_test" }, { - "name": "matches_device_test_lib" + "name": "matches_test_lib" }, { - "name": "matches_device_test_tests_macro_use_one" + "name": "matches_test_tests_macro_use_one" }, { - "name": "quiche_device_test_src_lib" - }, + "name": "matches_test_tests_use_star" + } + ], + "presubmit-rust": [ { - "name": "unicode-bidi_device_test_src_lib" + "name": "doh_unit_test" }, { - "name": "url_device_test_src_lib" + "name": "matches_test_lib" }, { - "name": "url_device_test_tests_data" + "name": "matches_test_tests_macro_use_one" }, { - "name": "url_device_test_tests_unit" + "name": "matches_test_tests_use_star" } ] } |