From 84133e05786dc05bbb3dc914ee32d2a537f7aeb0 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Tue, 14 Nov 2023 16:15:00 +0000
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: Ia6832031228cba0af95c051c864d250af37b8388
---
 Android.bp         | 111 +++++++++++++++++++++++++++++++++++++++++------------
 cargo2android.json |   9 -----
 cargo_embargo.json |   7 ++++
 3 files changed, 94 insertions(+), 33 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

diff --git a/Android.bp b/Android.bp
index e4d49f7..e17cc3c 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,99 +60,162 @@ rust_library {
     vendor_available: true,
 }
 
-rust_defaults {
-    name: "minimal-lexical_test_defaults",
-    crate_name: "minimal_lexical",
+rust_test {
+    name: "minimal-lexical_test_tests_integration_tests",
+    host_supported: true,
+    crate_name: "integration_tests",
     cargo_env_compat: true,
     cargo_pkg_version: "0.2.1",
+    srcs: ["tests/integration_tests.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "default",
         "std",
     ],
-    rustlibs: [
-        "libminimal_lexical",
-    ],
-}
-
-rust_test {
-    name: "minimal-lexical_test_tests_integration_tests",
-    defaults: ["minimal-lexical_test_defaults"],
-    host_supported: true,
-    srcs: ["tests/integration_tests.rs"],
-    test_options: {
-        unit_test: true,
-    },
+    rustlibs: ["libminimal_lexical"],
 }
 
 rust_test {
     name: "minimal-lexical_test_tests_lemire_tests",
-    defaults: ["minimal-lexical_test_defaults"],
     host_supported: true,
+    crate_name: "lemire_tests",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.1",
     srcs: ["tests/lemire_tests.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: ["libminimal_lexical"],
 }
 
 rust_test {
     name: "minimal-lexical_test_tests_mask_tests",
-    defaults: ["minimal-lexical_test_defaults"],
     host_supported: true,
+    crate_name: "mask_tests",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.1",
     srcs: ["tests/mask_tests.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: ["libminimal_lexical"],
 }
 
 rust_test {
     name: "minimal-lexical_test_tests_number_tests",
-    defaults: ["minimal-lexical_test_defaults"],
     host_supported: true,
+    crate_name: "number_tests",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.1",
     srcs: ["tests/number_tests.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: ["libminimal_lexical"],
 }
 
 rust_test {
     name: "minimal-lexical_test_tests_parse_tests",
-    defaults: ["minimal-lexical_test_defaults"],
     host_supported: true,
+    crate_name: "parse_tests",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.1",
     srcs: ["tests/parse_tests.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: ["libminimal_lexical"],
 }
 
 rust_test {
     name: "minimal-lexical_test_tests_rounding_tests",
-    defaults: ["minimal-lexical_test_defaults"],
     host_supported: true,
+    crate_name: "rounding_tests",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.1",
     srcs: ["tests/rounding_tests.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: ["libminimal_lexical"],
 }
 
 rust_test {
     name: "minimal-lexical_test_tests_slow_tests",
-    defaults: ["minimal-lexical_test_defaults"],
     host_supported: true,
+    crate_name: "slow_tests",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.1",
     srcs: ["tests/slow_tests.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: ["libminimal_lexical"],
 }
 
 rust_test {
     name: "minimal-lexical_test_tests_vec_tests",
-    defaults: ["minimal-lexical_test_defaults"],
     host_supported: true,
+    crate_name: "vec_tests",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.1",
     srcs: ["tests/vec_tests.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+    rustlibs: ["libminimal_lexical"],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 8e490de..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "device": true,
-  "run": true,
-  "tests": 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
+}
-- 
cgit v1.2.3