diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-11-09 03:12:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-09 03:12:06 +0000 |
| commit | bbfb016de9f620faa4d123a248f989a84635bbb5 (patch) | |
| tree | 6b0675ce2e9c41e9e3b330e5756732fc8073b498 | |
| parent | 51bcace9c25a0f8efcde4f778b08c528301082f8 (diff) | |
| parent | ebf0bc6a003b9520bcd9d5e24c9fa0d4610aaab4 (diff) | |
| download | instant-bbfb016de9f620faa4d123a248f989a84635bbb5.tar.gz | |
Migrate to cargo_embargo. am: 064020b2df am: ebf0bc6a00
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/instant/+/2822156
Change-Id: I7b61cc3fa9f9c0127213cacd01cfd2555c6764a8
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, 5 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 { @@ -26,9 +26,7 @@ rust_library { cargo_pkg_version: "0.1.12", srcs: ["src/lib.rs"], edition: "2018", - rustlibs: [ - "libcfg_if", - ], + rustlibs: ["libcfg_if"], apex_available: [ "//apex_available:platform", "com.android.btservices", diff --git a/cargo2android.json b/cargo_embargo.json index f994fab..85d370f 100644 --- a/cargo2android.json +++ b/cargo_embargo.json @@ -1,10 +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", + "run_cargo": false } |