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

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

diff --git a/Android.bp b/Android.bp
index 4245132..5c83f60 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 {
@@ -46,9 +46,7 @@ rust_library {
     srcs: ["src/lib.rs"],
     edition: "2021",
     features: ["all"],
-    rustlibs: [
-        "liblibc",
-    ],
+    rustlibs: ["liblibc"],
     apex_available: [
         "//apex_available:platform",
         "//apex_available:anyapex",
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 6cf7f3d..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "device": true,
-  "features": "all",
-  "min-sdk-version": "29",
-  "vendor-available": true,
-  "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..bc82b96
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,7 @@
+{
+  "features": [
+    "all"
+  ],
+  "min_sdk_version": "29",
+  "run_cargo": false
+}
-- 
cgit v1.2.3