commit 414d3f8ec630cd9991d8c0a02e2d5f7a2558a5fb
author Sergii Parubochyi <sergiip@google.com> Thu Nov 23 01:03:32 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 23 01:03:32 2023 +0000
tree 1581c4d9545cdce8e7df4125b43cb83b1a29f3b5
parent 6d4cd402e4881e420873bd3def9ff05f03080c5c
parent 7213272174365710bbefd1466c6762aa332b6c97

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>

Android.bp

diff --git a/Android.bp b/Android.bp
index bf50beb..86265a2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,7 +40,9 @@
     srcs: ["src/lib.rs"],
     edition: "2015",
     features: [
+        "mutex",
         "once",
+        "spin_mutex",
         "std",
     ],
     apex_available: [
@@ -66,7 +68,9 @@
     },
     edition: "2015",
     features: [
+        "mutex",
         "once",
+        "spin_mutex",
         "std",
     ],
     rustlibs: ["libcriterion"],

cargo_embargo.json

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