Snap for 11124398 from 29ed49d5abd1d17315c169a87d66947403701bce to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I7cb1f4744babf0ecda4acaee7bbde4b659e2ec13

3 files changed, 35 insertions, 23 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",
+    ],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index e0aa06c..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "device": true,
-  "features": "alloc,std",
-  "run": true,
-  "tests": true,
-  "vendor-available": false,
-  "product-available": false
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..e0003f2
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,10 @@
+{
+  "features": [
+    "alloc",
+    "std"
+  ],
+  "product_available": false,
+  "run_cargo": false,
+  "tests": true,
+  "vendor_available": false
+}