diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-05-11 15:56:08 +0000 |
|---|---|---|
| committer | Andrew Walbran <qwandor@google.com> | 2023-05-12 15:28:38 +0000 |
| commit | 7402cc0405e3ba27c66200862f9ce55be1384e78 (patch) | |
| tree | 37f0572d631a3250ae9de6d3977fb9542013822c | |
| parent | 03842cff6fcb5d00e38a6744c6e49aa7f688f965 (diff) | |
| download | half-7402cc0405e3ba27c66200862f9ce55be1384e78.tar.gz | |
Use new no-std flag to cargo2android.
Bug: 279614907
Test: Ran cargo2android and compared Android.bp
Change-Id: Ic565a66ba7a37bfc31b8b755bd7037db73578e68
| -rw-r--r-- | Android.bp | 14 | ||||
| -rw-r--r-- | cargo2android.json | 14 | ||||
| -rw-r--r-- | cargo2android_nostd.bp | 22 |
3 files changed, 19 insertions, 31 deletions
@@ -65,6 +65,11 @@ rust_library_rlib { cargo_pkg_version: "2.2.1", srcs: ["src/lib.rs"], edition: "2021", + features: ["alloc"], + apex_available: [ + "//apex_available:platform", + "//apex_available:anyapex", + ], prefer_rlib: true, no_stdlibs: true, stdlibs: [ @@ -72,11 +77,6 @@ rust_library_rlib { "libcompiler_builtins.rust_sysroot", "libcore.rust_sysroot", ], - features: [ - "alloc", - ], - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], + product_available: true, + vendor_available: true, } diff --git a/cargo2android.json b/cargo2android.json index 2f73971..1f63124 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,6 +1,16 @@ { - "add-toplevel-block": "cargo2android_nostd.bp", "device": true, "run": true, - "vendor-available": true + "variants": [ + { + }, + { + "alloc": true, + "features": "alloc", + "force-rlib": true, + "no-host": true, + "suffix": "_nostd", + "no-std": true + } + ] } diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp deleted file mode 100644 index db81b1a..0000000 --- a/cargo2android_nostd.bp +++ /dev/null @@ -1,22 +0,0 @@ -rust_library_rlib { - name: "libhalf_nostd", - crate_name: "half", - cargo_env_compat: true, - cargo_pkg_version: "2.2.1", - srcs: ["src/lib.rs"], - edition: "2021", - prefer_rlib: true, - no_stdlibs: true, - stdlibs: [ - "liballoc.rust_sysroot", - "libcompiler_builtins.rust_sysroot", - "libcore.rust_sysroot", - ], - features: [ - "alloc", - ], - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], -} |