diff options
author | Andrew Walbran <qwandor@google.com> | 2023-11-17 17:54:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-17 17:54:12 +0000 |
commit | e3f909dfee27c3f316f3de0291a7db9b8b7fed5c (patch) | |
tree | 009986d2124b05dc88e0ddcc7e8bc248bb6d2724 | |
parent | 4f1dc344ca9ebef00c5c9008f623988a89ae18d2 (diff) | |
parent | 2dce2ab7b545865a86e085bf2275932a63fffc98 (diff) | |
download | zip-e3f909dfee27c3f316f3de0291a7db9b8b7fed5c.tar.gz |
Migrate to cargo_embargo. am: 374ead5cc2 am: 99470abf00 am: 2dce2ab7b5
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/zip/+/2836476
Change-Id: Ib3adb42946cbed32131189dc5adc27d5e664fff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 3 | ||||
-rw-r--r-- | cargo2android.json | 11 | ||||
-rw-r--r-- | cargo_embargo.json | 15 |
3 files changed, 16 insertions, 13 deletions
@@ -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 +} |