From eab182bbb6dea93caf726c2a131b25249541ea0c Mon Sep 17 00:00:00 2001
From: Joel Galenson <jgalenson@google.com>
Date: Mon, 29 Nov 2021 14:05:52 -0800
Subject: Refresh Android.bp, cargo2android.json, TEST_MAPPING.

Test: None
Change-Id: I51d53c89fdef257e0315121a55041a9627e0ae93
---
 Android.bp   | 75 ++++++++++--------------------------------------------------
 TEST_MAPPING | 18 +++++++++++----
 2 files changed, 26 insertions(+), 67 deletions(-)

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