Migrate to cargo_embargo. am: 934c8dd8ee

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/remain/+/2834512

Change-Id: I44828493b2f85d20bc5141eef473f91d23747701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3 files changed, 37 insertions, 24 deletions

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",
@@ -71,19 +75,24 @@ 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
+}