From a45f1d19a02f5c10d8a15eb12eb5753c0a29a634 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Wed, 18 Oct 2023 17:57:29 +0100
Subject: Migrate to cargo_embargo.

Bug: 293289578
Test: Ran cargo_embargo, compared Android.bp
Change-Id: I1e4302e97a7077d390223845b3c2674afb256fc1
---
 Android.bp         | 6 ++----
 cargo2android.json | 5 -----
 cargo_embargo.json | 7 +++++++
 3 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 cargo2android.json
 create mode 100644 cargo_embargo.json

diff --git a/Android.bp b/Android.bp
index ae7d334..93130a4 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 {
@@ -49,9 +49,7 @@ rust_library {
         "serde",
         "std",
     ],
-    rustlibs: [
-        "libserde",
-    ],
+    rustlibs: ["libserde"],
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 456ff71..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "device": true,
-  "features": "serde,std",
-  "run": true
-}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..4af1a9a
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,7 @@
+{
+  "features": [
+    "serde",
+    "std"
+  ],
+  "run_cargo": false
+}
-- 
cgit v1.2.3