Move the build config logic for our memory tools into common.gypi.

build/common.gypi

 # Copyright (c) 2012 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 925 matching lines @@
       ['enable_web_intents_tag==1', {
         'grit_defines': ['-D', 'enable_web_intents_tag'],
       }],
 
       ['asan==1', {
         'clang%': 1,
         # Do not use Chrome plugins for Clang. The Clang version in
         # third_party/asan may be different from the default one.
         'clang_use_chrome_plugins%': 0,
       }],
+
+      # On valgrind bots, override the optimizer settings so we don't inline too
+      # much and make the stacks harder to figure out. Use the same settings
+      # on all buildbot masters to make it easier to move bots.
+      #
+      # TODO(rnk): Kill off variables that no one else uses and just implement
+      # them under a build_for_tool== condition.
+      ['build_for_tool=="memcheck" or build_for_tool=="tsan"', {
+        # gcc flags
+        'mac_debug_optimization': '1',
+        'mac_release_optimization': '1',
+        'release_optimize': '1',
+        'no_gc_sections': 1,
+        'debug_extra_cflags':
+          '-g -fno-inline -fno-omit-frame-pointer -fno-builtin -fno-optimize-sibling-calls',

[Marc-Antoine Ruel (Google), 2012/02/29 00:03:41]

style nit: you can split it up in 80 cols with python string concatenation.

[Reid Kleckner, 2012/02/29 20:20:16]

GYP is parsed with Python syntax rules and not JSON rules?

+        'release_extra_cflags':
+          '-g -fno-inline -fno-omit-frame-pointer -fno-builtin -fno-optimize-sibling-calls',
+
+        # MSVS flags

[Timur Iskhodzhanov, 2012/02/29 09:14:18]

# MSVS flags for TSan/Win

[Reid Kleckner, 2012/02/29 20:20:16]

Done.

+        'win_debug_RuntimeChecks': '0',
+        'win_debug_disable_iterator_debugging': '1',
+        'win_debug_Optimization': '1',
+        'win_debug_InlineFunctionExpansion': '0',
+        'win_release_InlineFunctionExpansion': '0',
+        'win_release_OmitFramePointers': '0',
+
+        'linux_use_tcmalloc': 1,
+        'release_valgrind_build': 1,
+        'werror': '',
+        'component': 'static_library',
+        'use_system_zlib': 0,
+      }],
+
+      # TODO(timurrrr): Investigate http://crbug.com/108155 .  It would be nice

[Timur Iskhodzhanov, 2012/02/29 09:14:18]

maybe you should move the comment a few lines down to correspond to the
commented-out lines

[Reid Kleckner, 2012/02/29 20:20:16]

I think of the comment as referring to the separation of these two configs
instead of the commented the lines.  If we fix that bug (I'm investigating a
shadow callstack), then we should combine these blocks.  Otherwise we can't be
as confident that the two configs are the same.

+      # if we could use the same flags as tsan to share a builder, but /O1
+      # breaks our callstacks.
+      ['build_for_tool=="drmemory"', {
+        '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',
+        # Keep the code under #ifndef NVALGRIND.
+        'release_valgrind_build': 1,
+        # DrMemory can't handle debug CRT dll, so build static.
+        'component': 'static_library',
+      }],
     ],
+
     # List of default apps to install in new profiles.  The first list contains
     # the source files as found in svn.  The second list, used only for linux,
     # contains the destination location for each of the files.  When a crx
     # is added or removed from the list, the chrome/browser/resources/
     # default_apps/external_extensions.json file must also be updated.
     'default_apps_list': [
       'browser/resources/default_apps/external_extensions.json',
       'browser/resources/default_apps/gmail.crx',
       'browser/resources/default_apps/search.crx',
       'browser/resources/default_apps/youtube.crx',
@@ skipping 1839 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }