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

chrome/chrome.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     # Define the common dependencies that contain all the actual
     # Chromium functionality.  This list gets pulled in below by
@@ skipping 3306 matching lines @@
                 'tools/build/linux/sed.sh',
                 'app/resources/manpage.1.in',
                 '<@(_outputs)',
                 '-e', 's/@@NAME@@/<(name)/',
                 '-e', 's/@@FILENAME@@/<(filename)/',
                 '-e', 's/@@CONFDIR@@/<(confdir)/',
               ],
               'message': 'Generating manpage'
             },
           ],
-
-          'conditions': [
-            # 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.
-            ['branding=="Chrome" and buildtype=="Official" and'
-                ' target_arch=="ia32"', {
-              'actions': [
-                {
-                  'action_name': 'dump_symbols',
-                  'inputs': [
-                    '<(DEPTH)/build/linux/dump_app_syms',
-                    '<(DEPTH)/build/linux/dump_signature.py',
-                    '<(PRODUCT_DIR)/dump_syms',
-                    '<(PRODUCT_DIR)/chrome',
-                  ],
-                  'outputs': [
-                    '<(PRODUCT_DIR)/chrome.breakpad.<(target_arch)',
-                  ],
-                  'action': ['<(DEPTH)/build/linux/dump_app_syms',
-                             '<(PRODUCT_DIR)/dump_syms',
-                             '<(PRODUCT_DIR)/chrome', '<@(_outputs)'],
-                  'message': 'Dumping breakpad symbols to <(_outputs)'
-                },
-              ],
-            }],
-          ],
           'dependencies': [
             # On Linux, link the dependencies (libraries) that make up actual
             # Chromium functionality directly into the executable.
             '<@(chromium_dependencies)',
             # Needed for chrome_dll_main.cc #include of gtk/gtk.h
             '../build/linux/system.gyp:gtk',
           ],
           'sources': [
             'app/chrome_dll_main.cc',
             'app/chrome_dll_resource.h',
@@ skipping 2261 matching lines @@
             '../testing/gtest.gyp:gtest',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             'test/reliability/page_load_test.cc',
             'test/reliability/page_load_test.h',
           ],
         },
+        {
+          'target_name': 'linux_symbols',
+          'type': 'none',
+          'conditions': [
+            ['linux_dump_symbols==1', {
+              'actions': [
+                {
+                  'action_name': 'dump_symbols',
+                  'inputs': [
+                    '<(DEPTH)/build/linux/dump_app_syms',
+                    '<(DEPTH)/build/linux/dump_signature.py',
+                    '<(PRODUCT_DIR)/dump_syms',
+                    '<(PRODUCT_DIR)/chrome',
+                  ],
+                  'outputs': [
+                    '<(PRODUCT_DIR)/chrome.breakpad.<(target_arch)',
+                  ],
+                  'action': ['<(DEPTH)/build/linux/dump_app_syms',
+                             '<(PRODUCT_DIR)/dump_syms',
+                             '<(PRODUCT_DIR)/chrome', '<@(_outputs)'],
+                  'message': 'Dumping breakpad symbols to <(_outputs)'
+                },
+              ],
+              'dependencies': [
+                'chrome',
+                '../breakpad/breakpad.gyp:dump_syms',
+              ],
+            }],
+          ],
+        }
       ],
     },],  # OS=="linux"
     ['OS!="win"',
       { 'targets': [
         {
           # Executable that runs each browser test in a new process.
           'target_name': 'browser_tests',
           'type': 'executable',
           'dependencies': [
             'browser',
@@ skipping 1144 matching lines @@
               'defines': [
                 'POSIX',
               ],
             }],
           ],
         },
       ],  # targets when chrome_personalization==1
     }],
   ],  # 'conditions'
 }