diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-16 02:07:45 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-12-16 02:07:45 +0000 |
commit | 8396b6b185cf9d2121bb1a5366f3b055044dfc54 (patch) | |
tree | d5565031c24b73809bb9eb7487752d66cda1bf9b | |
parent | f0d9e61df05ea65aee55592558b0dd329df2d538 (diff) | |
parent | 74ee487bf3761996d083859dc677ceaa1fb08071 (diff) | |
download | url-android13-release.tar.gz |
Snap for 8006021 from 74ee487bf3761996d083859dc677ceaa1fb08071 to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi
Change-Id: I6c078480918d01fb43cc31958f706d7ca91545d3
-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" } ] } |