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

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

diff --git a/Android.bp b/Android.bp
index 18d1eed..0f4ab8c 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 {
@@ -69,9 +69,7 @@ rust_test {
     },
     edition: "2015",
     features: ["default"],
-    rustlibs: [
-        "libcriterion",
-    ],
+    rustlibs: ["libcriterion"],
 }
 
 rust_test {
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index d36fb44..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "device": true,
-  "run": true,
-  "tests": true
-}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..c8842d1
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,4 @@
+{
+  "run_cargo": false,
+  "tests": true
+}
-- 
cgit v1.2.3