diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-11-14 19:42:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-14 19:42:49 +0000 |
| commit | ba6f55078d086ce72273da8cc16aa26d426225e9 (patch) | |
| tree | c0efa6518dd1631bd730ec0965b76b93bf8d7736 | |
| parent | a194ac7573032c9a2c1bb724b53d85122bae7584 (diff) | |
| parent | 78bd7a37912d543c85d165afcbf1cbd9a644083a (diff) | |
| download | libz-sys-ba6f55078d086ce72273da8cc16aa26d426225e9.tar.gz | |
Migrate to cargo_embargo. am: 78bd7a3791
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/2829973
Change-Id: Iebaf6faadf9b21ad6417e18238192a233606ac3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | cargo_embargo.json (renamed from cargo2android.json) | 7 |
2 files changed, 4 insertions, 9 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 { @@ -60,9 +60,7 @@ rust_library { "libc", "stock-zlib", ], - rustlibs: [ - "liblibc", - ], + rustlibs: ["liblibc"], shared_libs: ["libz"], apex_available: [ "//apex_available:platform", diff --git a/cargo2android.json b/cargo_embargo.json index adb04b1..f3c0ef8 100644 --- a/cargo2android.json +++ b/cargo_embargo.json @@ -1,12 +1,9 @@ { - "apex-available": [ + "apex_available": [ "//apex_available:platform", "com.android.btservices", "com.android.virt" ], - "dependencies": true, - "device": true, - "min-sdk-version": "29", - "run": true, + "min_sdk_version": "29", "tests": true } |