| commit | 8660b203f27fb41757c89353fc8ecbbb154934e8 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Thu Sep 29 23:08:46 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 29 23:08:46 2022 +0000 |
| tree | c2dae7849b8530952860a553def1085831169ffa | |
| parent | 8bbcd2d4ac159a95c88bfdcee46597c7ead8e82e [diff] | |
| parent | 682bb4a7b943fc483b7365b3c017d7683fe6333a [diff] |
Merge "libbinder: fix flake-mode build" am: ba0567443c am: f4a02f342f am: dae3be6415 am: 1e7302bd7f am: 682bb4a7b9 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2237181 Change-Id: I3bed4d57144528e6789a77e3438a0bd6cf5f0dc8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/RpcState.cpp b/libs/binder/RpcState.cpp index c0e36c4..c411f4f 100644 --- a/libs/binder/RpcState.cpp +++ b/libs/binder/RpcState.cpp
@@ -41,7 +41,7 @@ #if RPC_FLAKE_PRONE void rpcMaybeWaitToFlake() { [[clang::no_destroy]] static std::random_device r; - [[clang::no_destroy]] static std::mutex m; + [[clang::no_destroy]] static RpcMutex m; unsigned num; { RpcMutexLockGuard lock(m);