From 23f8a2527f5917a640237bf6e408c5552520e9ab Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Wed, 15 Nov 2023 16:53:39 +0000
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I930ab507b3c922756c762d9ad8e8f1b9c081420b
---
 Android.bp         | 88 ++++++++++++++++++++++++++++++++++++++++++------------
 cargo2android.json | 10 -------
 cargo_embargo.json |  7 +++++
 3 files changed, 76 insertions(+), 29 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

diff --git a/Android.bp b/Android.bp
index 90ea7dc..f08db48 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 {
@@ -55,13 +55,18 @@ rust_library {
     vendor_available: true,
 }
 
-rust_defaults {
-    name: "ryu_test_defaults",
-    crate_name: "ryu",
+rust_test {
+    name: "ryu_test_tests_common_test",
+    host_supported: true,
+    crate_name: "common_test",
     cargo_env_compat: true,
     cargo_pkg_version: "1.0.13",
+    srcs: ["tests/common_test.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     rustlibs: [
         "libnum_cpus",
@@ -71,62 +76,107 @@ rust_defaults {
     ],
 }
 
-rust_test {
-    name: "ryu_test_tests_common_test",
-    defaults: ["ryu_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/common_test.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
 rust_test {
     name: "ryu_test_tests_d2s_table_test",
-    defaults: ["ryu_test_defaults"],
     host_supported: true,
+    crate_name: "d2s_table_test",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.13",
     srcs: ["tests/d2s_table_test.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    rustlibs: [
+        "libnum_cpus",
+        "librand",
+        "librand_xorshift",
+        "libryu",
+    ],
 }
 
 rust_test {
     name: "ryu_test_tests_d2s_test",
-    defaults: ["ryu_test_defaults"],
     host_supported: true,
+    crate_name: "d2s_test",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.13",
     srcs: ["tests/d2s_test.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    rustlibs: [
+        "libnum_cpus",
+        "librand",
+        "librand_xorshift",
+        "libryu",
+    ],
 }
 
 rust_test {
     name: "ryu_test_tests_f2s_test",
-    defaults: ["ryu_test_defaults"],
     host_supported: true,
+    crate_name: "f2s_test",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.13",
     srcs: ["tests/f2s_test.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    rustlibs: [
+        "libnum_cpus",
+        "librand",
+        "librand_xorshift",
+        "libryu",
+    ],
 }
 
 rust_test {
     name: "ryu_test_tests_s2d_test",
-    defaults: ["ryu_test_defaults"],
     host_supported: true,
+    crate_name: "s2d_test",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.13",
     srcs: ["tests/s2d_test.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    rustlibs: [
+        "libnum_cpus",
+        "librand",
+        "librand_xorshift",
+        "libryu",
+    ],
 }
 
 rust_test {
     name: "ryu_test_tests_s2f_test",
-    defaults: ["ryu_test_defaults"],
     host_supported: true,
+    crate_name: "s2f_test",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.13",
     srcs: ["tests/s2f_test.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    rustlibs: [
+        "libnum_cpus",
+        "librand",
+        "librand_xorshift",
+        "libryu",
+    ],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index ac56e26..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "run": true,
-  "tests": true
-}
\ No newline at end of file
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
+}
-- 
cgit v1.2.3