commit 492adf41690fe306ed6cfecd6821fd0d24586c8c
author Brad Fitzpatrick <bradfitz@android.com> Mon Apr 19 11:40:48 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 19 11:40:48 2010 -0700
tree 00bcd867c60574faecb023db4e5a6324a4eb517e
parent cc45ee9c3c68f72391f5e7ba300312047d976bfa
parent dc5f3888d092310f1bb7f0d26be05d4b4cef6b91

am dc5f3888: am 135677a7: For userdebug builds, enable Dalvik lock contention sampling.

Merge commit 'dc5f3888d092310f1bb7f0d26be05d4b4cef6b91' into kraken

* commit 'dc5f3888d092310f1bb7f0d26be05d4b4cef6b91':
  For userdebug builds, enable Dalvik lock contention sampling.

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 7553ede..014c050 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -196,6 +196,9 @@
   ifeq ($(user_variant),userdebug)
     # Pick up some extra useful tools
     tags_to_install += debug
+
+    # Enable Dalvik lock contention logging for userdebug builds.
+    ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.lockprof.threshold=500
   else
     # Disable debugging in plain user builds.
     enable_target_debugging :=