Merge pull request #345 from electron/re-enable_debug_mode

Re-enabled debug mode, and disabled tcmalloc for shared_library build
This commit is contained in:
John Kleinschmidt 2017-08-23 07:58:34 -04:00 коммит произвёл GitHub
Родитель 9be85c78b8 620d3bf4ec
Коммит 7cdb1748f6
2 изменённых файлов: 4 добавлений и 10 удалений

Просмотреть файл

@ -1,8 +1,9 @@
root_extra_deps = [ "//chromiumcontent:chromiumcontent" ]
is_electron_build = true
is_component_build = true
is_debug = false
is_debug = true
symbol_level = 2
use_allocator = "none" # on Linux this defaults to "tcmalloc", but tcmalloc deadlocks when Electron CI tests are run inside Docker
enable_nacl = false
enable_widevine = true
proprietary_codecs = true

Просмотреть файл

@ -1,15 +1,8 @@
diff --git a/base/allocator/BUILD.gn b/base/allocator/BUILD.gn
index 8cdb06161f5c..6f938d6be67b 100644
index 8cdb06161f5c..285461d3381d 100644
--- a/base/allocator/BUILD.gn
+++ b/base/allocator/BUILD.gn
@@ -10,12 +10,13 @@ declare_args() {
# Provide a way to force disable debugallocation in Debug builds,
# e.g. for profiling (it's more rare to profile Debug builds,
# but people sometimes need to do that).
- enable_debugallocation = is_debug
+ enable_debugallocation = false
}
@@ -16,6 +16,7 @@ declare_args() {
# The Windows-only allocator shim is only enabled for Release static builds, and
# is mutually exclusive with the generalized shim.
win_use_allocator_shim = is_win && !is_component_build && !is_debug &&