Remove a circular dependency for chrome Linux symbols. Make it possible to force Linux symbol dumping.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/243056

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27752 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 44 insertions, 29 deletions

diff --git a/build/common.gypi b/build/common.gypi
index aad3600..bffde17 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -41,6 +41,8 @@
       # 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
@@ -144,7 +146,7 @@
 
     # 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,
 
@@ -156,6 +158,17 @@
           }, {
             '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,
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index d5c9b15..84fa030 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3328,34 +3328,6 @@
               '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.
@@ -5637,6 +5609,36 @@
             '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"',