diff options
author | Brian Carlstrom <bdc@google.com> | 2013-08-14 22:35:01 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-14 22:35:01 -0700 |
commit | ec5683a4c79c3df6bec9329e59999bbc1e4a636a (patch) | |
tree | f97684690083e2e54c1a64376e2565ff87563851 | |
parent | ca06c307910a827f4d96a1c294ed8f78b97d4b35 (diff) | |
parent | a7e8919e4aae44274f5427f11d74fe3bc045c9c7 (diff) | |
download | art-ec5683a4c79c3df6bec9329e59999bbc1e4a636a.zip art-ec5683a4c79c3df6bec9329e59999bbc1e4a636a.tar.gz art-ec5683a4c79c3df6bec9329e59999bbc1e4a636a.tar.bz2 |
am a7e8919e: am 2e250c82: Revert "Always enable lock level checks."
* commit 'a7e8919e4aae44274f5427f11d74fe3bc045c9c7':
Revert "Always enable lock level checks."
-rw-r--r-- | runtime/base/mutex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h index 0e5445f..297a63d 100644 --- a/runtime/base/mutex.h +++ b/runtime/base/mutex.h @@ -47,7 +47,7 @@ namespace art { class ScopedContentionRecorder; class Thread; -const bool kDebugLocking = true || kIsDebugBuild; +const bool kDebugLocking = kIsDebugBuild; // Record Log contention information, dumpable via SIGQUIT. #ifdef ART_USE_FUTEXES |