Merge branch 'froyo' into froyo-release

2010-04-19 12:50:23 -07:00 · 2010-04-19 12:50:23 -07:00 · 900d4182c8
commit 900d4182c8
parent 67d4bc5966 135677a718
1 changed files with 3 additions and 0 deletions
--- a/core/main.mk
+++ b/core/main.mk
@ -196,6 +196,9 @@ ifneq (,$(user_variant))
  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 :=