Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b97b1e59 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Gerrit Code Review
Browse files

Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"

parents 98f7742a 85d56eba
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -329,9 +329,6 @@ 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 :=
@@ -365,6 +362,8 @@ endif # !user_variant
ifeq (true,$(strip $(enable_target_debugging)))
  # Target is more debuggable and adbd is on by default
  ADDITIONAL_DEFAULT_PROPERTIES += ro.debuggable=1
  # Enable Dalvik lock contention logging.
  ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.lockprof.threshold=500
  # Include the debugging/testing OTA keys in this build.
  INCLUDE_TEST_OTA_KEYS := true
else # !enable_target_debugging