commit dc5f3888d092310f1bb7f0d26be05d4b4cef6b91
author Brad Fitzpatrick <bradfitz@android.com> Mon Apr 19 11:35:26 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 19 11:35:26 2010 -0700
tree 79eb52b1adeeb49dae75bc10ad422ee5b7e8a9b7
parent 8b687440688ac41d6b6754537bf4a0f9dcb14fbd
parent 135677a71800c27d7747b5c86712d05a74392f62

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

Merge commit '135677a71800c27d7747b5c86712d05a74392f62' into froyo-plus-aosp

* commit '135677a71800c27d7747b5c86712d05a74392f62':
  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 :=