From 934c8dd8eeaa08c3a9d88b5aa99c0378a1ab79b1 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Thu, 16 Nov 2023 14:36:21 +0000
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I250201a4950269bba2dbce2483c0152dead0a5f8
---
 Android.bp         | 37 +++++++++++++++++++++++--------------
 cargo2android.json | 10 ----------
 cargo_embargo.json | 14 ++++++++++++++
 3 files changed, 37 insertions(+), 24 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

diff --git a/Android.bp b/Android.bp
index 3a32a71..53c4784 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 {
@@ -51,13 +51,17 @@ rust_proc_macro {
     ],
 }
 
-rust_defaults {
-    name: "remain_test_defaults",
-    crate_name: "remain",
+rust_test_host {
+    name: "remain_test_tests_stable",
+    crate_name: "stable",
     cargo_env_compat: true,
     cargo_pkg_version: "0.2.8",
+    srcs: ["tests/stable.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     rustlibs: [
         "libproc_macro2",
@@ -70,20 +74,25 @@ rust_defaults {
     ],
 }
 
-rust_test_host {
-    name: "remain_test_tests_stable",
-    defaults: ["remain_test_defaults"],
-    srcs: ["tests/stable.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
 rust_test_host {
     name: "remain_test_tests_unstable",
-    defaults: ["remain_test_defaults"],
+    crate_name: "unstable",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.8",
     srcs: ["tests/unstable.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     test_options: {
         unit_test: true,
     },
+    edition: "2018",
+    rustlibs: [
+        "libproc_macro2",
+        "libquote",
+        "libsyn",
+    ],
+    proc_macros: [
+        "libremain",
+        "librustversion",
+    ],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index f0fb860..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "dependency-blocklist": [
-    "trybuild"
-  ],
-  "test-blocklist": [
-    "tests/compiletest.rs"
-  ],
-  "run": true,
-  "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..b5c7065
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,14 @@
+{
+  "module_blocklist": [
+    "remain_test_tests_compiletest"
+  ],
+  "package": {
+    "remain": {
+      "dep_blocklist": [
+        "libtrybuild"
+      ],
+      "device_supported": false
+    }
+  },
+  "tests": true
+}
-- 
cgit v1.2.3