From 54100691661ac74fa965fa469bb7c607b7164607 Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Fri, 29 Sep 2023 17:07:06 +0100
Subject: Migrate to cargo_embargo.

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

diff --git a/Android.bp b/Android.bp
index ced92eb..f170196 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 {
@@ -55,9 +55,7 @@ rust_test {
         "default",
         "std",
     ],
-    rustlibs: [
-        "libmemchr",
-    ],
+    rustlibs: ["libmemchr"],
 }
 
 rust_library {
@@ -72,9 +70,7 @@ rust_library {
         "default",
         "std",
     ],
-    rustlibs: [
-        "libmemchr",
-    ],
+    rustlibs: ["libmemchr"],
     apex_available: [
         "//apex_available:platform",
         "com.android.compos",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index bef74ca..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.compos",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "run": true,
-  "tests": true,
-  "vendor-available": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..b553798
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,9 @@
+{
+  "tests": true,
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.compos",
+    "com.android.virt"
+  ],
+  "run_cargo": false
+}
-- 
cgit v1.2.3