Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1

2 files changed, 13 insertions, 14 deletions

diff --git a/Android.bp b/Android.bp
index 8e9044a..ca5cb84 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,6 +44,8 @@ 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: [
@@ -56,7 +58,3 @@ 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 be39865..407ec5c 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,20 +1,21 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
-  "presubmit": [
-    {
-      "name": "doh_unit_test"
-    },
+  "imports": [
     {
-      "name": "quiche_device_test_src_lib"
+      "path": "external/rust/crates/quiche"
     },
     {
-      "name": "url_device_test_src_lib"
-    },
+      "path": "external/rust/crates/url"
+    }
+  ],
+  "presubmit": [
     {
-      "name": "url_device_test_tests_data"
-    },
+      "name": "doh_unit_test"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "url_device_test_tests_unit"
+      "name": "doh_unit_test"
     }
   ]
 }