Remove a circular dependency for chrome Linux symbols. Make it possible to fo...

build/common.gypi

 # Copyright (c) 2009 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': {
     # .gyp files should set chromium_code to 1 if they build Chromium-specific
@@ skipping 23 matching lines @@
       # on 'buildtype' (i.e. we don't care about saving symbols for non-Official
       # builds).
       'buildtype%': 'Dev',
 
       # The architecture that we're building on.
       'target_arch%': 'ia32',
 
       # We do want to build Chromium with Breakpad support in certain
       # situations. I.e. for Chrome bot.
       'linux_chromium_breakpad%': 0,
+      # And if we want to dump symbols.
+      'linux_chromium_dump_symbols': 0,
 
       # By default, Linux does not use views. To turn on views in Linux,
       # set the variable GYP_DEFINES to "toolkit_views=1", or modify
       # ~/.gyp/include.gypi .
       'toolkit_views%': 0,
 
       # Defaults to a desktop build, overridden via command line/env.
       'chromeos%': 0,
 
       # This variable tells WebCore.gyp and JavaScriptCore.gyp whether they are
@@ skipping 83 matching lines @@
     # The system root for cross-compiles. Default: none.
     'sysroot%': '',
 
     # This is the location of the sandbox binary. Chrome looks for this before
     # running the zygote process. If found, and SUID, it will be used to
     # sandbox the zygote process and, thus, all renderer processes.
     'linux_sandbox_path%': '',
 
     # Set this to true to enable SELinux support.
     'selinux%': 0,
-    
+
     # Set to select the Title Case versions of strings in GRD files.
     'use_titlecase_in_grd_files%': 0,
 
     'conditions': [
       ['OS=="linux"', {
         'conditions': [
           ['branding=="Chrome" or linux_chromium_breakpad==1', {
             'linux_breakpad%': 1,
           }, {
             'linux_breakpad%': 0,
           }],
+          # All Chrome builds have breakpad symbols, but only process the
+          # symbols from official builds.
+          # TODO(mmoss) dump_syms segfaults on x64. Enable once dump_syms and
+          # crash server handle 64-bit symbols.
+          ['linux_chromium_dump_symbols==1 or '
+           '(branding=="Chrome" and buildtype=="Official" and '
+           'target_arch=="ia32")', {
+            'linux_dump_symbols%': 1,
+          }, {
+            'linux_dump_symbols%': 0,
+          }],
           ['toolkit_views==0', {
             # GTK wants Title Case strings
             'use_titlecase_in_grd_files%': 1,
           }],
         ],
       }],  # OS=="linux"
       ['OS=="mac"', {
         # Mac wants Title Case strings
         'use_titlecase_in_grd_files%': 1,
         'conditions': [
@@ skipping 689 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',
   },
 }