| commit | dae3be64150cecc37538c7e3398ed253a176472f | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Thu Sep 29 21:30:25 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 29 21:30:25 2022 +0000 |
| tree | 7d8eb2b71e92b376ac5c6ada9ff7481bf557b28e | |
| parent | 992e9ef47ed500852022dff74fc2f0e2ba3c1fd8 [diff] | |
| parent | f4a02f342f8f406ac645c937c1e250375f509e2e [diff] |
Merge "libbinder: fix flake-mode build" am: ba0567443c am: f4a02f342f Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2237181 Change-Id: Ife24987df6bb3433d6e67a82ea927efc90832072 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);