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

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: Ie914e9164bd46a85d2e326c66c0fcc1705f51d58
---
 Android.bp         |  4 +---
 cargo2android.json |  9 ---------
 cargo_embargo.json | 11 +++++++++++
 3 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

diff --git a/Android.bp b/Android.bp
index 3ac933a..e94e37c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
-// 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.
 
-
-
 rust_library_rlib {
     name: "libsmccc",
     crate_name: "smccc",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index c78127b..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "dependencies": true,
-  "device": true,
-  "force-rlib": true,
-  "no-host": true,
-  "no-std": true,
-  "run": true,
-  "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..e3c9cb8
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,11 @@
+{
+  "package": {
+    "smccc": {
+      "force_rlib": true,
+      "host_supported": false,
+      "no_std": true
+    }
+  },
+  "run_cargo": false,
+  "tests": true
+}
-- 
cgit v1.2.3