diff options
author | Andrew Walbran <qwandor@google.com> | 2022-04-14 17:08:22 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-14 17:08:22 +0000 |
commit | 7a244b5e4fee3972be8dedc59545cd85b80ef1a7 (patch) | |
tree | b619093c261ac042480332cde19ac9635c2f1676 | |
parent | a0b4c6f95336547845c690398e237152dfcc9b8d (diff) | |
parent | 4965fc4a2da2e4242be6dbe6109c439975d6944c (diff) | |
download | spin-android13-qpr2-s1-release.tar.gz |
Add no_std version of library, with different set of features enabled. am: 60b657631f am: c6af0a407b am: a6eaa7f8a0 am: b465a99820 am: 4965fc4a2dandroid-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/spin/+/2064987
Change-Id: I353f33e52602a7b32e4db74d1c930f3dcc4aad7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 20 | ||||
-rw-r--r-- | cargo2android.json | 1 | ||||
-rw-r--r-- | cargo2android_nostd.bp | 18 |
3 files changed, 39 insertions, 0 deletions
@@ -71,6 +71,26 @@ rust_test { ], } +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", +} + + // Errors when listing tests: // error[E0433]: failed to resolve: could not find `Mutex` in `spin` // error[E0433]: failed to resolve: could not find `RwLock` in `spin` diff --git a/cargo2android.json b/cargo2android.json index 1fff1ac..086d38a 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,4 +1,5 @@ { + "add-toplevel-block": "cargo2android_nostd.bp", "apex-available": [ "//apex_available:platform", "com.android.compos", diff --git a/cargo2android_nostd.bp b/cargo2android_nostd.bp new file mode 100644 index 0000000..49d0318 --- /dev/null +++ b/cargo2android_nostd.bp @@ -0,0 +1,18 @@ +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", +} |