diff options
| author | Andrew Walbran <qwandor@google.com> | 2022-04-14 16:05:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-14 16:05:21 +0000 |
| commit | a6eaa7f8a0b41194f37f8a7ab4e0fcd4ee6bd28e (patch) | |
| tree | b619093c261ac042480332cde19ac9635c2f1676 | |
| parent | d9022a57a9eceee26d14144700acc4fc2501e371 (diff) | |
| parent | c6af0a407b41d5e18222f0871ceb870e9654402e (diff) | |
| download | spin-a6eaa7f8a0b41194f37f8a7ab4e0fcd4ee6bd28e.tar.gz | |
Add no_std version of library, with different set of features enabled. am: 60b657631f am: c6af0a407b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/spin/+/2064987
Change-Id: I27d0415504a87b7778cf6f9d97ae31a67d491849
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", +} |