aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergii Parubochyi <sergiip@google.com>2023-11-23 01:03:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-23 01:03:32 +0000
commit414d3f8ec630cd9991d8c0a02e2d5f7a2558a5fb (patch)
tree1581c4d9545cdce8e7df4125b43cb83b1a29f3b5
parent6d4cd402e4881e420873bd3def9ff05f03080c5c (diff)
parent7213272174365710bbefd1466c6762aa332b6c97 (diff)
downloadspin-414d3f8ec630cd9991d8c0a02e2d5f7a2558a5fb.tar.gz
Add mutex feature for std variant am: 4e5cfa7cfc am: 207a35def4 am: 7213272174
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/spin/+/2842870 Change-Id: Ib3aef05eca7a5c33572e10454e3f82ac58538eab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp4
-rw-r--r--cargo_embargo.json2
2 files changed, 6 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index bf50beb..86265a2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,7 +40,9 @@ rust_library {
srcs: ["src/lib.rs"],
edition: "2015",
features: [
+ "mutex",
"once",
+ "spin_mutex",
"std",
],
apex_available: [
@@ -66,7 +68,9 @@ rust_test {
},
edition: "2015",
features: [
+ "mutex",
"once",
+ "spin_mutex",
"std",
],
rustlibs: ["libcriterion"],
diff --git a/cargo_embargo.json b/cargo_embargo.json
index d3b04d4..e32838b 100644
--- a/cargo_embargo.json
+++ b/cargo_embargo.json
@@ -5,6 +5,8 @@
{
"features": [
"once",
+ "mutex",
+ "spin_mutex",
"std"
],
"tests": true