commit ee86670715b2f28028e6c270e07dcbd56882c5ec
author Joel Galenson <jgalenson@google.com> Wed Dec 15 18:06:44 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 15 18:06:44 2021 +0000
tree 30213169e4773c9fe221936a65ae5a689056b021
parent 8f9df34f9b5868571d8cb6a46d502c61c0ddf1a3
parent 9c73ec7439d599c6c4685868d81022423d29492b

Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: e5ca9e6204 am: 220298c4a7 am: 2909f09db1 am: 9c73ec7439

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/percent-encoding/+/1912483

Change-Id: I5b83a46ab032da9b7288b0345311dac5388a54bf

Android.bp

diff --git a/Android.bp b/Android.bp
index 1d2ef2f..58d499f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,6 +44,8 @@
     name: "libpercent_encoding",
     host_supported: true,
     crate_name: "percent_encoding",
+    cargo_env_compat: true,
+    cargo_pkg_version: "2.1.0",
     srcs: ["lib.rs"],
     edition: "2015",
     apex_available: [

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"
     }
   ]
 }