diff options
author | Andrew Walbran <qwandor@google.com> | 2023-06-02 14:17:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-02 14:17:11 +0000 |
commit | f11e5b0674a9d2ef4c7325944397b3857b2b959d (patch) | |
tree | f6204668f203c8a398bef63db89767aab225427c | |
parent | ccda06839a65b1f58b69fe7184ca9cdf28007e5a (diff) | |
parent | b27b48ea05784cee84c16c6fb3b5e6b9f3272473 (diff) | |
download | spin-f11e5b0674a9d2ef4c7325944397b3857b2b959d.tar.gz |
Use new no-std flag to cargo2android. am: 43ac7ff683 am: 431f9c706b am: 09403d81a1 am: 2a1f8ed26a am: b27b48ea05
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/spin/+/2586926
Change-Id: I36cdf391e5621b9ed29e56ebd0b5af0584e4877a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 49 | ||||
-rw-r--r-- | cargo2android.json | 23 | ||||
-rw-r--r-- | cargo2android_nostd.bp | 18 |
3 files changed, 41 insertions, 49 deletions
@@ -45,9 +45,33 @@ rust_library { ], apex_available: [ "//apex_available:platform", - "com.android.compos", - "com.android.resolv", - "com.android.virt", + "//apex_available:anyapex", + ], + product_available: true, + vendor_available: true, + min_sdk_version: "29", +} + +rust_library_rlib { + name: "libspin_nostd", + crate_name: "spin", + cargo_env_compat: true, + cargo_pkg_version: "0.9.7", + srcs: ["src/lib.rs"], + edition: "2015", + features: [ + "mutex", + "spin_mutex", + ], + 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, @@ -75,22 +99,3 @@ rust_test { "libcriterion", ], } - -rust_library_rlib { - name: "libspin_nostd", - host_supported: true, - crate_name: "spin", - cargo_env_compat: true, - cargo_pkg_version: "0.9.2", - srcs: ["src/lib.rs"], - edition: "2015", - features: [ - "mutex", - "spin_mutex", - ], - apex_available: [ - "//apex_available:platform", - "com.android.virt", - ], - min_sdk_version: "29", -} diff --git a/cargo2android.json b/cargo2android.json index 0be577a..89dc9e6 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,15 +1,20 @@ { - "add-toplevel-block": "cargo2android_nostd.bp", - "apex-available": [ - "//apex_available:platform", - "com.android.compos", - "com.android.resolv", - "com.android.virt" - ], "dependencies": true, "device": true, - "features": "once,std", + "ignore-cargo-errors": true, "min-sdk-version": "29", "run": true, - "tests": true + "variants": [ + { + "features": "once,std", + "tests": true + }, + { + "features": "mutex,spin_mutex", + "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 49d0318..0000000 --- a/cargo2android_nostd.bp +++ /dev/null @@ -1,18 +0,0 @@ -rust_library_rlib { - name: "libspin_nostd", - host_supported: true, - crate_name: "spin", - cargo_env_compat: true, - cargo_pkg_version: "0.9.2", - srcs: ["src/lib.rs"], - edition: "2015", - features: [ - "mutex", - "spin_mutex", - ], - apex_available: [ - "//apex_available:platform", - "com.android.virt", - ], - min_sdk_version: "29", -} |