| commit | f4a02f342f8f406ac645c937c1e250375f509e2e | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Thu Sep 29 20:51:27 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 29 20:51:27 2022 +0000 |
| tree | f8ac688505189ae67fbf9f6427390072edb8367b | |
| parent | 341a05cc3bfdf4fb797d2d64faea66431c13006a [diff] | |
| parent | ba0567443c03088d4ba0550e16a3423603c853cc [diff] |
Merge "libbinder: fix flake-mode build" am: ba0567443c Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2237181 Change-Id: Id38e82e3bbf3997bfbd1a24fe098d889d7367393 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);