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 | 74ee487bf3761996d083859dc677ceaa1fb08071 (patch) | |
tree | d5565031c24b73809bb9eb7487752d66cda1bf9b | |
parent | ae999bf97c65a073a1b319f94ff655058b7df2ef (diff) | |
parent | f64db99d9b7034a7c868f9ac1377955cc9572b67 (diff) | |
download | url-74ee487bf3761996d083859dc677ceaa1fb08071.tar.gz |
Refresh Android.bp, cargo2android.json, TEST_MAPPING. am: eab182bbb6 am: 2ba8d324a9 am: cc721e0e56 am: f64db99d9bt_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/url/+/1912487
Change-Id: I3094e16184d136b3af1325b3f6302cf4fe7e5e93
-rw-r--r-- | Android.bp | 75 | ||||
-rw-r--r-- | TEST_MAPPING | 18 |
2 files changed, 26 insertions, 67 deletions
@@ -41,6 +41,8 @@ rust_library { name: "liburl", host_supported: true, crate_name: "url", + cargo_env_compat: true, + cargo_pkg_version: "2.2.2", srcs: ["src/lib.rs"], edition: "2018", rustlibs: [ @@ -57,38 +59,10 @@ rust_library { } rust_defaults { - name: "url_defaults", - crate_name: "url", - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2018", - rustlibs: [ - "libbencher", - "libform_urlencoded", - "libidna", - "libmatches", - "libpercent_encoding", - "libserde_json", - ], -} - -rust_test_host { - name: "url_host_test_src_lib", - defaults: ["url_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "url_device_test_src_lib", - defaults: ["url_defaults"], -} - -rust_defaults { - name: "url_defaults_url", + name: "url_test_defaults", crate_name: "url", + cargo_env_compat: true, + cargo_pkg_version: "2.2.2", test_suites: ["general-tests"], auto_gen_config: true, edition: "2018", @@ -103,9 +77,10 @@ rust_defaults { ], } -rust_test_host { - name: "url_host_test_tests_data", - defaults: ["url_defaults_url"], +rust_test { + name: "url_test_tests_data", + defaults: ["url_test_defaults"], + host_supported: true, srcs: ["tests/data.rs"], test_options: { unit_test: true, @@ -113,37 +88,11 @@ rust_test_host { } rust_test { - name: "url_device_test_tests_data", - defaults: ["url_defaults_url"], - srcs: ["tests/data.rs"], -} - -rust_test_host { - name: "url_host_test_tests_unit", - defaults: ["url_defaults_url"], + name: "url_test_tests_unit", + defaults: ["url_test_defaults"], + host_supported: true, srcs: ["tests/unit.rs"], test_options: { unit_test: true, }, } - -rust_test { - name: "url_device_test_tests_unit", - defaults: ["url_defaults_url"], - srcs: ["tests/unit.rs"], -} - -// dependent_library ["feature_list"] -// bencher-0.1.5 -// form_urlencoded-1.0.1 -// idna-0.2.3 -// itoa-0.4.7 -// matches-0.1.8 -// percent-encoding-2.1.0 -// ryu-1.0.5 -// serde-1.0.125 "std" -// serde_json-1.0.64 "default,std" -// tinyvec-1.2.0 "alloc,default,tinyvec_macros" -// tinyvec_macros-0.1.0 -// unicode-bidi-0.3.5 "default" -// unicode-normalization-0.1.17 "default,std" diff --git a/TEST_MAPPING b/TEST_MAPPING index be39865..cc34a06 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -1,20 +1,30 @@ // Generated by update_crate_tests.py for tests that depend on this crate. { + "imports": [ + { + "path": "external/rust/crates/quiche" + } + ], "presubmit": [ { "name": "doh_unit_test" }, { - "name": "quiche_device_test_src_lib" + "name": "url_test_tests_data" }, { - "name": "url_device_test_src_lib" + "name": "url_test_tests_unit" + } + ], + "presubmit-rust": [ + { + "name": "doh_unit_test" }, { - "name": "url_device_test_tests_data" + "name": "url_test_tests_data" }, { - "name": "url_device_test_tests_unit" + "name": "url_test_tests_unit" } ] } |