Snap for 8730993 from f1c3cf9fe248b371448ddd8ad4c989cdab57f10c to mainline-tzdata3-release
Change-Id: I491534325b050996f6d775d7156d560ffab40b70
diff --git a/Android.bp b/Android.bp
index 82f0f0b..02e5f65 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,8 +41,6 @@
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: [
@@ -59,10 +57,38 @@
}
rust_defaults {
- name: "url_test_defaults",
+ name: "url_defaults",
crate_name: "url",
- cargo_env_compat: true,
- cargo_pkg_version: "2.2.2",
+ 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",
+ crate_name: "url",
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2018",
@@ -77,10 +103,9 @@
],
}
-rust_test {
- name: "url_test_tests_data",
- defaults: ["url_test_defaults"],
- host_supported: true,
+rust_test_host {
+ name: "url_host_test_tests_data",
+ defaults: ["url_defaults_url"],
srcs: ["tests/data.rs"],
test_options: {
unit_test: true,
@@ -88,11 +113,37 @@
}
rust_test {
- name: "url_test_tests_unit",
- defaults: ["url_test_defaults"],
- host_supported: true,
+ 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"],
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 cc34a06..be39865 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,30 +1,20 @@
// 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": "url_test_tests_data"
+ "name": "quiche_device_test_src_lib"
},
{
- "name": "url_test_tests_unit"
- }
- ],
- "presubmit-rust": [
- {
- "name": "doh_unit_test"
+ "name": "url_device_test_src_lib"
},
{
- "name": "url_test_tests_data"
+ "name": "url_device_test_tests_data"
},
{
- "name": "url_test_tests_unit"
+ "name": "url_device_test_tests_unit"
}
]
}
