Reverting 24220.

breakpad/breakpad.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.
 
 {
   'includes': [
     '../build/common.gypi',
   ],
   'conditions': [
     [ 'OS=="mac"', {
@@ skipping 198 matching lines @@
           'direct_dependent_settings': {
             'include_dirs': [
               'src',
             ],
           },
         },
       ],
     }],
     [ 'OS=="linux"', {
       'conditions': [
-        # Tools needed for archiving build symbols.
-        ['branding=="Chrome" or linux_breakpad==1', {
+        # Tools needed for archiving official build symbols.
+        ['branding=="Chrome"', {
           'targets': [
             {
               'target_name': 'symupload',
               'type': 'executable',
 
               # This uses the system libcurl, so don't use the default 32-bit
               # compile flags when building on a 64-bit machine.
               'variables': {
                 'host_arch': '<!(uname -m)',
               },
@@ skipping 100 matching lines @@
           ],
 
           'include_dirs': [
             '..',
           ],
         },
       ],
     }],
   ],
 }