From edbc0e515f27ee57301c91d57b5242a47bc60819 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Mon, 13 Nov 2023 17:14:45 +0000
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I4bf5b90ecdb678f4f80e5ea71b04c19834596a82
---
 Android.bp         | 48 ++++++++++++++++++++++++------------------------
 cargo2android.json | 23 -----------------------
 cargo_embargo.json | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 47 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

diff --git a/Android.bp b/Android.bp
index 70ea7d7..1089f61 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 {
@@ -63,6 +63,29 @@ rust_library {
     min_sdk_version: "29",
 }
 
+rust_test {
+    name: "serde_test_src_lib",
+    host_supported: true,
+    crate_name: "serde",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.158",
+    srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
+    edition: "2015",
+    features: [
+        "default",
+        "derive",
+        "rc",
+        "serde_derive",
+        "std",
+    ],
+    proc_macros: ["libserde_derive"],
+}
+
 rust_library_rlib {
     name: "libserde_nostd",
     crate_name: "serde",
@@ -91,26 +114,3 @@ rust_library_rlib {
     vendor_available: true,
     min_sdk_version: "29",
 }
-
-rust_test {
-    name: "serde_test_src_lib",
-    host_supported: true,
-    crate_name: "serde",
-    cargo_env_compat: true,
-    cargo_pkg_version: "1.0.158",
-    srcs: ["src/lib.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    test_options: {
-        unit_test: true,
-    },
-    edition: "2015",
-    features: [
-        "default",
-        "derive",
-        "rc",
-        "serde_derive",
-        "std",
-    ],
-    proc_macros: ["libserde_derive"],
-}
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 4f669f8..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "cfg-blocklist": [
-    "std_atomic64"
-  ],
-  "dependencies": true,
-  "device": true,
-  "min_sdk_version": "29",
-  "run": true,
-  "variants": [
-    {
-      "features": "default,derive,rc",
-      "tests": true
-    },
-    {
-      "alloc": true,
-      "features": "alloc,derive",
-      "force-rlib": true,
-      "no-host": true,
-      "suffix": "_nostd",
-      "no-std": true
-    }
-  ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..550005b
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,34 @@
+{
+  "cfg_blocklist": [
+    "std_atomic64"
+  ],
+  "min_sdk_version": "29",
+  "run_cargo": false,
+  "variants": [
+    {
+      "features": [
+        "default",
+        "derive",
+        "rc"
+      ],
+      "tests": true
+    },
+    {
+      "features": [
+        "alloc",
+        "derive"
+      ],
+      "module_name_overrides": {
+        "libserde": "libserde_nostd"
+      },
+      "package": {
+        "serde": {
+          "alloc": true,
+          "force_rlib": true,
+          "host_supported": false,
+          "no_std": true
+        }
+      }
+    }
+  ]
+}
-- 
cgit v1.2.3