From 0c2595665f4e9ea9b9619bfc30818e02bfaba38a Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Fri, 10 Nov 2023 17:04:29 +0000
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I1e60afe20238d9e6dedb582b9f3f9e587cfe3cde
---
 Android.bp         | 12 ++++++------
 cargo2android.json | 20 --------------------
 cargo_embargo.json | 29 +++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 26 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

diff --git a/Android.bp b/Android.bp
index 1a07941..6d59537 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 {
@@ -47,9 +47,9 @@ rust_library_rlib {
     product_available: true,
     vendor_available: true,
     visibility: [
-         "//external/rust/crates/der:__subpackages__",
-         "//external/rust/crates/x509-cert:__subpackages__",
-         "//system/keymint:__subpackages__",
-    ]
-    ,
+        "//external/rust/crates/der:__subpackages__",
+        "//external/rust/crates/x509-cert:__subpackages__",
+        "//system/keymint:__subpackages__",
+    ],
+
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 973f0f9..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "run": true,
-  "vendor-available": true,
-  "variants": [
-    {
-    },
-    {
-      "device": true,
-      "no-host": true,
-      "add-module-block": "cargo2android_viz.bp",
-      "force-rlib": true,
-      "suffix": "_nostd",
-      "no-std": true
-    }
-  ]
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..064a7af
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,29 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "run_cargo": false,
+  "variants": [
+    {
+      "package": {
+        "flagset": {
+          "device_supported": false
+        }
+      }
+    },
+    {
+      "module_name_overrides": {
+        "libflagset": "libflagset_nostd"
+      },
+      "package": {
+        "flagset": {
+          "add_module_block": "cargo2android_viz.bp",
+          "force_rlib": true,
+          "host_supported": false,
+          "no_std": true
+        }
+      }
+    }
+  ]
+}
-- 
cgit v1.2.3