diff options
| author | Andrew Walbran <qwandor@google.com> | 2023-05-12 20:09:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-12 20:09:29 +0000 |
| commit | 74666bdf7d119c387632e6a7e258255deb75ec8e (patch) | |
| tree | 18e54538c3519d090abf406f41563b06a5ae5a76 | |
| parent | b796b7e8f95e3c72ad209e21e800d6d0a9e4cadc (diff) | |
| parent | 16c84f032a9ad0a023dbf53d001da88cce40cb50 (diff) | |
| download | tinyvec-74666bdf7d119c387632e6a7e258255deb75ec8e.tar.gz | |
Use new no-std flag to cargo2android. am: d4eff4d3b1 am: 3be4d2d758 am: 503669b689 am: 875357c176 am: 125c08f3d0 am: 16c84f032a
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tinyvec/+/2586809
Change-Id: I12b64b51b95c02f38e02281e6069775c3eeb7a74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | Android.bp | 42 | ||||
| -rw-r--r-- | cargo2android.json | 20 | ||||
| -rw-r--r-- | cargo2android_nostd.bp | 16 |
3 files changed, 36 insertions, 42 deletions
@@ -58,7 +58,29 @@ rust_library { ], apex_available: [ "//apex_available:platform", - "com.android.resolv", + "//apex_available:anyapex", + ], + product_available: true, + vendor_available: true, + min_sdk_version: "29", +} + +rust_library_rlib { + name: "libtinyvec_nostd", + crate_name: "tinyvec", + cargo_env_compat: true, + cargo_pkg_version: "1.6.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, @@ -107,21 +129,3 @@ rust_test { unit_test: true, }, } - -rust_library_rlib { - name: "libtinyvec_nostd", - crate_name: "tinyvec", - cargo_env_compat: true, - cargo_pkg_version: "1.5.1", - srcs: ["src/lib.rs"], - edition: "2018", - prefer_rlib: true, - no_stdlibs: true, - stdlibs: [ - "libcompiler_builtins.rust_sysroot", - "libcore.rust_sysroot", - ], - vendor_available: true, - min_sdk_version: "29", -} - diff --git a/cargo2android.json b/cargo2android.json index 811fadf..d3ea6e6 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,13 +1,19 @@ { - "add-toplevel-block": "cargo2android_nostd.bp", - "apex-available": [ - "//apex_available:platform", - "com.android.resolv" - ], "dependencies": true, "device": true, - "features": "alloc,default,std,tinyvec_macros", "min-sdk-version": "29", "run": true, - "tests": true + "variants": [ + { + "features": "alloc,default,std,tinyvec_macros", + "tests": true + }, + { + "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 d18c622..0000000 --- a/cargo2android_nostd.bp +++ /dev/null @@ -1,16 +0,0 @@ -rust_library_rlib { - name: "libtinyvec_nostd", - crate_name: "tinyvec", - cargo_env_compat: true, - cargo_pkg_version: "1.5.1", - srcs: ["src/lib.rs"], - edition: "2018", - prefer_rlib: true, - no_stdlibs: true, - stdlibs: [ - "libcompiler_builtins.rust_sysroot", - "libcore.rust_sysroot", - ], - vendor_available: true, - min_sdk_version: "29", -} |