diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-05-12 17:12:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-12 17:12:57 +0000 |
| commit | f09401eff5ba5ccbd80cbcc9b7512f0eebf4b04e (patch) | |
| tree | 5467880948c3c5fdaab582b474fb32c92d1a862c | |
| parent | 63ee129be713cc3a937127ef71b2b0ef79ab872a (diff) | |
| parent | 255fdd5fbb8c8f891f0216a0bbe520579a5ac097 (diff) | |
| download | uuid-f09401eff5ba5ccbd80cbcc9b7512f0eebf4b04e.tar.gz | |
Use new no-std flag to cargo2android. am: 2466fd3c4d am: 255fdd5fbb
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/uuid/+/2584313
Change-Id: I1bc238b81d1443d46c366cad1af7c2138035a2e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 11 | ||||
| -rw-r--r-- | cargo2android.json | 20 | ||||
| -rw-r--r-- | cargo2android_nostd.bp | 14 |
3 files changed, 21 insertions, 24 deletions
@@ -62,7 +62,7 @@ rust_library { ], apex_available: [ "//apex_available:platform", - "com.android.virt", + "//apex_available:anyapex", ], product_available: true, vendor_available: true, @@ -72,14 +72,19 @@ rust_library_rlib { name: "libuuid_nostd", crate_name: "uuid", cargo_env_compat: true, - cargo_pkg_version: "0.8.2", + cargo_pkg_version: "1.3.0", srcs: ["src/lib.rs"], edition: "2018", + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], prefer_rlib: true, no_stdlibs: true, stdlibs: [ "libcompiler_builtins.rust_sysroot", "libcore.rust_sysroot", ], + product_available: true, + vendor_available: true, } - diff --git a/cargo2android.json b/cargo2android.json index 8e77693..3a42f4e 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,11 +1,17 @@ { - "add-toplevel-block": "cargo2android_nostd.bp", - "apex-available": [ - "//apex_available:platform", - "com.android.virt" - ], "dependencies": true, "device": true, - "features": "serde,std,v1,v4", - "run": true + "run": true, + "variants": [ + { + "features": "serde,std,v1,v4" + }, + { + "features": "", + "force-rlib": true, + "no-host": true, + "suffix": "_nostd", + "no-std": true + } + ] }
\ No newline at end of file diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp deleted file mode 100644 index 15fa75b..0000000 --- a/cargo2android_nostd.bp +++ /dev/null @@ -1,14 +0,0 @@ -rust_library_rlib { - name: "libuuid_nostd", - crate_name: "uuid", - cargo_env_compat: true, - cargo_pkg_version: "0.8.2", - srcs: ["src/lib.rs"], - edition: "2018", - prefer_rlib: true, - no_stdlibs: true, - stdlibs: [ - "libcompiler_builtins.rust_sysroot", - "libcore.rust_sysroot", - ], -} |