Migrate to cargo_embargo. am: 374ead5cc2
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/zip/+/2836476
Change-Id: I6b348a08a1e501bf87e64c5aecb2992ad656f653
Signed-off-by: Automerger Merge Worker <[email protected]>
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 @@
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
+}