summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-07-10 13:13:32 -0700
committerBrian Carlstrom <bdc@google.com>2013-07-12 09:59:39 -0700
commit5cd9e3b122f276f610980cbaf0d2ad6ed4cd9088 (patch)
tree649049981a0e58343dbb8557559582c15c4580bf /src
parent098249eb69eb204d9eef5b47269079407e5195f5 (diff)
downloadandroid_art-5cd9e3b122f276f610980cbaf0d2ad6ed4cd9088.tar.gz
android_art-5cd9e3b122f276f610980cbaf0d2ad6ed4cd9088.tar.bz2
android_art-5cd9e3b122f276f610980cbaf0d2ad6ed4cd9088.zip
Revert "Always enable lock level checks." DO NOT MERGE
This reverts commit ccf124800fe025be3ca05c28a60514909ca66a11. (cherry picked from commit 27c590edf6c24107b6473e84e526c432bd081f6e) Change-Id: I2be879dcd126fc8d043641bdfbf2f9b80a678d10
Diffstat (limited to 'src')
-rw-r--r--src/base/mutex.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/base/mutex.h b/src/base/mutex.h
index 24df572e97..b62755917c 100644
--- a/src/base/mutex.h
+++ b/src/base/mutex.h
@@ -53,7 +53,7 @@ namespace art {
class ScopedContentionRecorder;
class Thread;
-const bool kDebugLocking = true || kIsDebugBuild;
+const bool kDebugLocking = kIsDebugBuild;
// Base class for all Mutex implementations
class BaseMutex {