Merge 154083 - Re-Fix official Linux builds, broken by missing symupload.

breakpad/breakpad.gyp

 # Copyright (c) 2012 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': [
     'breakpad_sender.gypi',
     'breakpad_handler.gypi',
   ],
   'conditions': [
@@ skipping 354 matching lines @@
               ],
               'include_dirs': [
                 'src',
                 'src/third_party',
                 '..',
               ],
             },
             {
               'target_name': 'symupload',
               'type': 'executable',
-              'conditions': [
-                ['OS=="android"', {
-                  'toolsets': [ 'host' ],
-                }],
-              ],
 
               # 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)',
               },
               'conditions': [
                 ['host_arch=="x86_64"', {
                   'cflags!': ['-m32', '-march=pentium4', '-msse2',
                               '-mfpmath=sse'],
@@ skipping 456 matching lines @@
             'include_dirs': [
               '<(DEPTH)/third_party/GTM',
               '<(DEPTH)/third_party/GTM/Foundation',
             ],
           },
         },
       ],
     }],
   ],
 }