diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-11-20 18:08:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-20 18:08:55 +0000 |
| commit | b5f74e6bb55da11be30dab15cccdf70c4dc73234 (patch) | |
| tree | 32a543cb7de12e587741bb8cb0b3c28791c6f838 | |
| parent | 16e0ef9e5a19ca12691bf807530e29fcd125c38c (diff) | |
| parent | 16de3e3d9ddbe7dc11fefdb945ba5f065fce0e81 (diff) | |
| download | parking_lot_core-b5f74e6bb55da11be30dab15cccdf70c4dc73234.tar.gz | |
Migrate to cargo_embargo. am: 221d207ead am: 34f463cc17 am: 16de3e3d9d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/parking_lot_core/+/2837829
Change-Id: I580a74777f264db05ff6eb42292a9b669abc3cac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | cargo_embargo.json (renamed from cargo2android.json) | 7 |
2 files changed, 4 insertions, 7 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 { @@ -41,7 +41,6 @@ license { rust_library { name: "libparking_lot_core", - // has rustc warnings host_supported: true, crate_name: "parking_lot_core", cargo_env_compat: true, @@ -65,7 +64,6 @@ rust_library { rust_test { name: "parking_lot_core_test_src_lib", - // has rustc warnings host_supported: true, crate_name: "parking_lot_core", cargo_env_compat: true, diff --git a/cargo2android.json b/cargo_embargo.json index da746ae..c9aea70 100644 --- a/cargo2android.json +++ b/cargo_embargo.json @@ -1,11 +1,10 @@ { - "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", + "run_cargo": false, "tests": true } |