From 374ead5cc2958fa8dcdebc0f4dc7162149aa091b Mon Sep 17 00:00:00 2001
From: Andrew Walbran <qwandor@google.com>
Date: Fri, 17 Nov 2023 12:52:02 +0000
Subject: Migrate to cargo_embargo.

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

diff --git a/Android.bp b/Android.bp
index 8ccfd4a..7c4953a 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 {
@@ -20,7 +20,6 @@ license {
 
 rust_library {
     name: "libzip",
-    // has rustc warnings
     host_supported: true,
     crate_name: "zip",
     cargo_env_compat: true,
diff --git a/cargo2android.json b/cargo2android.json
deleted file mode 100644
index 42d8c8b..0000000
--- a/cargo2android.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "apex-available": [
-    "//apex_available:platform",
-    "com.android.virt"
-  ],
-  "dependencies": true,
-  "device": true,
-  "patch": "patches/Android.bp.diff",
-  "features": "deflate-zlib",
-  "run": true
-}
diff --git a/cargo_embargo.json b/cargo_embargo.json
new file mode 100644
index 0000000..0fdd156
--- /dev/null
+++ b/cargo_embargo.json
@@ -0,0 +1,15 @@
+{
+  "apex_available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
+  "features": [
+    "deflate-zlib"
+  ],
+  "package": {
+    "zip": {
+      "patch": "patches/Android.bp.diff"
+    }
+  },
+  "run_cargo": false
+}
-- 
cgit v1.2.3