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

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

diff --git a/Android.bp b/Android.bp
index 4b50bf1..3755207 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,7 @@ rust_library {
     cargo_pkg_version: "4.1.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
-    rustlibs: [
-        "libnom",
-    ],
+    rustlibs: ["libnom"],
     apex_available: [
         "//apex_available:platform",
         "com.android.virt",
@@ -71,7 +69,5 @@ rust_test {
         unit_test: true,
     },
     edition: "2018",
-    rustlibs: [
-        "libnom",
-    ],
+    rustlibs: ["libnom"],
 }
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 8e490de..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "device": true,
-  "run": true,
-  "tests": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..fcc96ec
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,8 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "run_cargo": false,
+  "tests": true
+}
-- 
cgit v1.2.3