diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-15 01:05:47 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-15 01:05:47 +0000 |
commit | 7af30d9f97a56eb413b0441d834d7b65da02fd16 (patch) | |
tree | b619093c261ac042480332cde19ac9635c2f1676 | |
parent | d7d1b668f110ec8eb166ee2f98f41f761e4a6b51 (diff) | |
parent | 4965fc4a2da2e4242be6dbe6109c439975d6944c (diff) | |
download | spin-android13-d1-s3-release.tar.gz |
Snap for 8458482 from 4965fc4a2da2e4242be6dbe6109c439975d6944c to tm-d1-releaseandroid-13.0.0_r9android-13.0.0_r15android-13.0.0_r14android-13.0.0_r13android-13.0.0_r11android-13.0.0_r10android13-d1-s3-releaseandroid13-d1-s2-releaseandroid13-d1-s1-releaseandroid13-d1-release
Change-Id: Ia78a3b73081e5390d52e2ac3898e9f7632eb1850
-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", +} |