Snap for 11097608 from 5712b423327d39125d8bab2b6b4fcbef2359421b 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: Ic79c1ef5cf4f599a439d87aaa8240544306cfdcc

3 files changed, 33 insertions, 31 deletions

diff --git a/Android.bp b/Android.bp
index 1823905..91446d9 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 {
@@ -50,9 +50,7 @@ rust_library {
         "std",
     ],
     cfgs: ["has_i128"],
-    rustlibs: [
-        "libnum_traits",
-    ],
+    rustlibs: ["libnum_traits"],
     apex_available: [
         "//apex_available:platform",
         "com.android.virt",
@@ -79,18 +77,21 @@ rust_test {
         "std",
     ],
     cfgs: ["has_i128"],
-    rustlibs: [
-        "libnum_traits",
-    ],
+    rustlibs: ["libnum_traits"],
 }
 
-rust_defaults {
-    name: "num-integer_test_defaults",
-    crate_name: "num_integer",
+rust_test {
+    name: "num-integer_test_tests_average",
+    host_supported: true,
+    crate_name: "average",
     cargo_env_compat: true,
     cargo_pkg_version: "0.1.45",
+    srcs: ["tests/average.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2015",
     features: [
         "default",
@@ -104,21 +105,25 @@ rust_defaults {
 }
 
 rust_test {
-    name: "num-integer_test_tests_average",
-    defaults: ["num-integer_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/average.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
     name: "num-integer_test_tests_roots",
-    defaults: ["num-integer_test_defaults"],
     host_supported: true,
+    crate_name: "roots",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.45",
     srcs: ["tests/roots.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2015",
+    features: [
+        "default",
+        "std",
+    ],
+    cfgs: ["has_i128"],
+    rustlibs: [
+        "libnum_integer",
+        "libnum_traits",
+    ],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 67a4c45..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "device": true,
-  "run": true,
-  "tests": true,
-  "vendor-available": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..7f14879
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,7 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "tests": true
+}