diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-11-14 20:39:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-14 20:39:37 +0000 |
| commit | 01b6ccbee9d5f07fcab9bb67471ee4538b9e01ab (patch) | |
| tree | df7c08f6154dcfe32a64a11060d1dceb272f6ea7 | |
| parent | 987ce3b96c2a32cfefab767c246074c0cb90afe9 (diff) | |
| parent | dfa89a5e8d03d9d7e47885853a9f28503f26b6f9 (diff) | |
| download | lock_api-01b6ccbee9d5f07fcab9bb67471ee4538b9e01ab.tar.gz | |
Migrate to cargo_embargo. am: 247db62d4b am: 0b153a6157 am: dfa89a5e8d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/lock_api/+/2829974
Change-Id: I1bb4d9526d2b72801b9ddec83d05fd1e6b0f8bb2
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) | 6 |
2 files changed, 4 insertions, 8 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 { @@ -46,9 +46,7 @@ rust_library { srcs: ["src/lib.rs"], edition: "2018", cfgs: ["has_const_fn_trait_bound"], - rustlibs: [ - "libscopeguard", - ], + rustlibs: ["libscopeguard"], apex_available: [ "//apex_available:platform", "com.android.btservices", diff --git a/cargo2android.json b/cargo_embargo.json index da746ae..f3c0ef8 100644 --- a/cargo2android.json +++ b/cargo_embargo.json @@ -1,11 +1,9 @@ { - "apex-available": [ + "apex_available": [ "//apex_available:platform", "com.android.btservices", "com.android.virt" ], - "device": true, - "min-sdk-version": "29", - "run": true, + "min_sdk_version": "29", "tests": true } |