Split Dr.Memory GYP defines into a separate constant

scripts/master/factory/chromium_factory.py

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Utility class to build the chromium master BuildFactory's.
 
 Based on gclient_factory.py and adds chromium-specific steps."""
 
 import os
 import re
@@ skipping 25 matching lines @@
     'debug_extra_cflags="-g -fno-inline -fno-omit-frame-pointer '
                         '-fno-builtin -fno-optimize-sibling-calls" '
     'release_extra_cflags="-g -fno-inline -fno-omit-frame-pointer '
                           '-fno-builtin -fno-optimize-sibling-calls" '
 
     # MSVS flags
     'win_debug_RuntimeChecks=0 '
     'win_debug_disable_iterator_debugging=1 '
     'win_debug_Optimization=1 '
     'win_debug_InlineFunctionExpansion=0 '
-    'win_debug_OmitFramePointers=0 '
     'win_release_InlineFunctionExpansion=0 '
     'win_release_OmitFramePointers=0 '
 
     'linux_use_tcmalloc=1 '
     'release_valgrind_build=1 '
     'werror= '
   )
 
+  # TODO(timurrrr): investigate http://crbug.com/108155,
+  # uncomment and merge it with MEMORY_TOOLS_GYP_DEFINES.
+  # The commented parts of this list are wannabes but don't work yet.
+  DR_MEMORY_GYP_DEFINES = (
+    'win_debug_RuntimeChecks=0 '
+    'win_debug_disable_iterator_debugging=1 '

[Timur Iskhodzhanov, 2011/12/20 13:56:54]

Derek, Reid:
I'm leaving these two options here as they should increase the performance a bit
compared to the default flags.
If thing go bad, I'll comment them too.

+    # 'win_debug_Optimization=1 '
+    # 'win_debug_InlineFunctionExpansion=0 '
+    # 'win_debug_OmitFramePointers=0 '
+
+    'win_release_InlineFunctionExpansion=0 '
+    'win_release_OmitFramePointers=0 '
+  )
+
   # gclient custom vars
   CUSTOM_VARS_GOOGLECODE_URL = ('googlecode_url', config.Master.googlecode_url)
   CUSTOM_VARS_SOURCEFORGE_URL = ('sourceforge_url',
                                  config.Master.sourceforge_url)
   CUSTOM_VARS_WEBKIT_MIRROR = ('webkit_trunk', config.Master.webkit_trunk_url)
   # $$WK_REV$$ below will be substituted with the revision that triggered the
   # build in chromium_step.py@GClient.startVC. Use this only with builds
   # triggered by a webkit poller.
   CUSTOM_VARS_WEBKIT_LATEST = [('webkit_trunk', config.Master.webkit_trunk_url),
                                ('webkit_revision', '$$WK_REV$$')]
@@ skipping 770 matching lines @@
     if 'cros_deps' not in [s.name for s in self._solutions]:
       self._solutions.append(gclient_factory.GClientSolution(
           config.Master.trunk_url + '/src/tools/cros.DEPS', name='cros_deps'))
     if 'asan.DEPS' not in [s.name for s in self._solutions]:
       self._solutions.append(gclient_factory.GClientSolution(
           'http://src.chromium.org/svn/trunk/deps/asan.DEPS',
           'asan.DEPS'))
     return self.ChromiumFactory(target, clobber, tests, mode, slave_type,
                                 options, compile_timeout, build_url, project,
                                 factory_properties)