Snap for 11117647 from e3203898714b028b97db6abfc5504f96f338db34 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I6d0122a0b1ab6036f3ec6b44dcee3b13c82bef8e

3 files changed, 16 insertions, 13 deletions

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
+}