commit 39ec5f1a3b09152436701de9f0fab44f9e600112
author Joel Galenson <jgalenson@google.com> Wed Dec 15 18:06:59 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 15 18:06:59 2021 +0000
tree 6d4fa9382aaa915f8b4d15c553b86795035e31a3
parent 7a2383e602e2af58c5844daf9e4da7678f11cdcf
parent 6b630847e9807291a2008652ea749a62a8051b11

Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 8a5248c94f am: 9b3f8a8fba am: 61ccad06c6 am: 6b630847e9

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/form_urlencoded/+/1912641

Change-Id: Ic6cc0dbf232d575bff12fd662686234ddbbb6161

Android.bp

diff --git a/Android.bp b/Android.bp
index 8e9044a..ca5cb84 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,6 +44,8 @@
     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 @@
     ],
     min_sdk_version: "29",
 }
-
-// dependent_library ["feature_list"]
-//   matches-0.1.8
-//   percent-encoding-2.1.0

TEST_MAPPING

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.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/quiche"
+    },
+    {
+      "path": "external/rust/crates/url"
+    }
+  ],
   "presubmit": [
     {
       "name": "doh_unit_test"
-    },
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "quiche_device_test_src_lib"
-    },
-    {
-      "name": "url_device_test_src_lib"
-    },
-    {
-      "name": "url_device_test_tests_data"
-    },
-    {
-      "name": "url_device_test_tests_unit"
+      "name": "doh_unit_test"
     }
   ]
 }