aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Walbran <qwandor@google.com>2023-11-17 12:52:02 +0000
committerAndrew Walbran <qwandor@google.com>2023-11-17 12:52:02 +0000
commit374ead5cc2958fa8dcdebc0f4dc7162149aa091b (patch)
tree009986d2124b05dc88e0ddcc7e8bc248bb6d2724
parent493fe954f73c18b2248c05fe057afef049cac7ff (diff)
downloadzip-374ead5cc2958fa8dcdebc0f4dc7162149aa091b.tar.gz
Migrate to cargo_embargo.
Bug: 293289578 Test: Ran cargo_embargo, compared Android.bp Change-Id: I3a7e78174b10b31a1b506f57941fa620baca9827
-rw-r--r--Android.bp3
-rw-r--r--cargo2android.json11
-rw-r--r--cargo_embargo.json15
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
+}