Snap for 8730993 from e94f6887b541219b84e5029b2b2570a1979b544a to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010

Change-Id: Id030126624d4221ddf04ce00c60069ee077fac0d

2 files changed, 11 insertions, 13 deletions

diff --git a/Android.bp b/Android.bp
index ca5cb84..8e9044a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,8 +44,6 @@ rust_library {
     name: "libform_urlencoded",
     host_supported: true,
     crate_name: "form_urlencoded",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.0.1",
     srcs: ["src/lib.rs"],
     edition: "2018",
     rustlibs: [
@@ -58,3 +56,7 @@ rust_library {
     ],
     min_sdk_version: "29",
 }
+
+// dependent_library ["feature_list"]
+//   matches-0.1.8
+//   percent-encoding-2.1.0
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 407ec5c..8f984d7 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,21 +1,17 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "imports": [
+  "presubmit": [
     {
-      "path": "external/rust/crates/quiche"
+      "name": "url_device_test_src_lib"
     },
     {
-      "path": "external/rust/crates/url"
-    }
-  ],
-  "presubmit": [
+      "name": "quiche_device_test_src_lib"
+    },
     {
-      "name": "doh_unit_test"
-    }
-  ],
-  "presubmit-rust": [
+      "name": "url_device_test_tests_data"
+    },
     {
-      "name": "doh_unit_test"
+      "name": "url_device_test_tests_unit"
     }
   ]
 }