1 files changed, 24 insertions, 15 deletions
diff --git a/Android.bp b/Android.bp
index ac8429c..9629b9a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --config cargo2android.json.
+// This file is generated by cargo_embargo.
 // Do not modify this file as changes will be overridden on upgrade.
 
 package {
@@ -60,13 +60,18 @@ rust_library {
     min_sdk_version: "29",
 }
 
-rust_defaults {
-    name: "url_test_defaults",
-    crate_name: "url",
+rust_test {
+    name: "url_test_tests_data",
+    host_supported: true,
+    crate_name: "data",
     cargo_env_compat: true,
     cargo_pkg_version: "2.3.1",
+    srcs: ["tests/data.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: ["default"],
     rustlibs: [
@@ -80,21 +85,25 @@ rust_defaults {
 }
 
 rust_test {
-    name: "url_test_tests_data",
-    defaults: ["url_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/data.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
     name: "url_test_tests_unit",
-    defaults: ["url_test_defaults"],
     host_supported: true,
+    crate_name: "unit",
+    cargo_env_compat: true,
+    cargo_pkg_version: "2.3.1",
     srcs: ["tests/unit.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: ["default"],
+    rustlibs: [
+        "libbencher",
+        "libform_urlencoded",
+        "libidna",
+        "libpercent_encoding",
+        "libserde_json",
+        "liburl",
+    ],
 }