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

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

diff --git a/Android.bp b/Android.bp
index b9c70cf..5f6ea53 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 {
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: ["default"],
-    rustlibs: [
-        "libmemchr",
-    ],
+    rustlibs: ["libmemchr"],
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index bf78496..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "device": true,
-  "run": true
-}
\ No newline at end of file
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..cb908d7
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,3 @@
+{
+  "run_cargo": false
+}
-- 
cgit v1.2.3