diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-09-19 21:41:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-19 21:41:01 +0000 |
| commit | b97b1e59409ea4b873dbb8d83ba73f978ba7fcba (patch) | |
| tree | 38011debf952fd5511c056839b1ccac848e17e9c | |
| parent | 98f7742a7f5bdc69913ba5e15bba2e60ae5cf724 (diff) | |
| parent | 85d56eba9911ec7550a53ef247455c79a58102a7 (diff) | |
| download | build-b97b1e59409ea4b873dbb8d83ba73f978ba7fcba.tar.gz | |
Merge "Enable dalvik.vm.lockprof.threshold on eng builds in addition to userdebug"
| -rw-r--r-- | core/main.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/main.mk b/core/main.mk index d719b38baf..1958a16748 100644 --- a/core/main.mk +++ b/core/main.mk @@ -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 |