1 files changed, 25 insertions, 15 deletions

diff --git a/Android.bp b/Android.bp
index 76da448..27efee5 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 {
@@ -77,13 +77,18 @@ rust_test {
     ],
 }
 
-rust_defaults {
-    name: "webpki_test_defaults",
-    crate_name: "webpki",
+rust_test {
+    name: "webpki_test_tests_dns_name_tests",
+    host_supported: true,
+    crate_name: "dns_name_tests",
     cargo_env_compat: true,
     cargo_pkg_version: "0.22.0",
+    srcs: ["tests/dns_name_tests.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "alloc",
@@ -98,21 +103,26 @@ rust_defaults {
 }
 
 rust_test {
-    name: "webpki_test_tests_dns_name_tests",
-    defaults: ["webpki_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/dns_name_tests.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
     name: "webpki_test_tests_integration",
-    defaults: ["webpki_test_defaults"],
     host_supported: true,
+    crate_name: "integration",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.22.0",
     srcs: ["tests/integration.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "alloc",
+        "std",
+    ],
+    rustlibs: [
+        "libbase64_rust",
+        "libring",
+        "libuntrusted",
+        "libwebpki",
+    ],
 }