Fix breakpad-related Linux official build breakage.

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
     # the link of the actual chrome (or chromium) executable on
@@ skipping 1544 matching lines @@
           ],
           'sources!': [
             'browser/debugger/debugger_shell_stubs.cc',
             # Windows-specific files.
             'browser/download/download_exe.cc',
           ],
           'conditions': [
             ['linux_breakpad==1', {
               'sources': [
                 'browser/renderer_host/render_crash_handler_host_linux.cc',
+                'app/breakpad_linux.cc',
+                'app/breakpad_linux.h',
+              ],
+              'dependencies': [
+                '../breakpad/breakpad.gyp:breakpad_client',
+              ],
+              'include_dirs': [
+                # breakpad_linux.cc wants file_version_info_linux.h
+                '<(SHARED_INTERMEDIATE_DIR)',
               ],
             }, {
               'sources': [
                 'browser/renderer_host/render_crash_handler_host_linux_stub.cc',
+                'app/breakpad_linux_stub.cc',
+                'app/breakpad_linux.h',
               ],
             }],
           ],
         }],
         ['OS=="linux" and toolkit_views==0', {
           'sources!': [
             'browser/bookmarks/bookmark_drop_info.cc',
           ],
         }],
         ['OS=="mac"', {
@@ skipping 504 matching lines @@
                         '<(INTERMEDIATE_DIR)/repack/en-US.pak',
                         '<(INTERMEDIATE_DIR)/repack/he.pak',
                         '<(INTERMEDIATE_DIR)/repack/zh-TW.pak',
                         ],
             },
             {
               'destination': '<(PRODUCT_DIR)/themes',
               'files': ['<(INTERMEDIATE_DIR)/repack/default.pak'],
             },
           ],
-          'include_dirs': [
-            # Needed in order to be able to read the raw
-            # file_version_info_linux.h file.
-            '<(SHARED_INTERMEDIATE_DIR)',
-          ],
-          'conditions': [
-            ['linux_breakpad==1', {
-              'sources': [
-                'app/breakpad_linux.cc',
-                'app/breakpad_linux.h',
-              ],
-              'dependencies': [
-                '../breakpad/breakpad.gyp:breakpad_client',
-              ],
-            }, {
-              'sources': [
-                'app/breakpad_linux_stub.cc',
-                'app/breakpad_linux.h',
-              ],
-            }],
-          ]
         }],
         ['OS=="linux" and toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
         }],
         ['OS=="mac"', {
           # 'branding' is a variable defined in common.gypi
           # (e.g. "Chromium", "Chrome")
           'conditions': [
@@ skipping 1759 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],
   ],  # 'conditions'
 }