Roll Breakpad to release 1020

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',
+              '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'],
                   'ldflags!': ['-m32'],
                   'cflags': ['-O2'],
                   'include_dirs!': ['/usr/include32'],
                 }],
                 ['OS=="android"', {
                   'toolsets': [ 'host' ],
                 }],
               ],
 
               'sources': [
                 'src/tools/linux/symupload/sym_upload.cc',
                 'src/common/linux/http_upload.cc',
                 'src/common/linux/http_upload.h',
               ],
               'include_dirs': [
                 'src',
+                'src/third_party',
               ],
               'link_settings': {
                 'libraries': [
                   '-ldl',
                 ],
               },
             },
             {
               'target_name': 'dump_syms',
               'type': 'executable',
@@ skipping 109 matching lines @@
             'src/common/string_conversion.cc',
             'src/common/string_conversion.h',
           ],
 
           'conditions': [
             # Android NDK toolchain doesn't support -mimplicit-it=always
             ['target_arch=="arm" and OS!="android"', {
               'cflags': ['-Wa,-mimplicit-it=always'],
             }],
             ['OS=="android"', {
-              'sources!':[
-                'src/common/linux/elf_core_dump.cc',
-                'src/common/linux/elf_core_dump.h',
+              'include_dirs': [
+                'src/common/android/include',
               ],
+              'direct_dependent_settings': {
+                'include_dirs': [
+                  'src/common/android/include',
+                ],
+              },
             }],
           ],
 
           'link_settings': {
             'libraries': [
               '-ldl',
             ],
           },
 
           'include_dirs': [
@@ skipping 70 matching lines @@
             '..',
             '.',
           ],
           'conditions': [
             [ 'clang == 1', {
               'cflags': [
                 # See http://crbug.com/138571#c18
                 '-Wno-unused-value',
               ],
             }],
+            ['OS=="android"', {
+              'libraries': [
+                '-llog',
+              ],
+              'include_dirs': [
+                'src/common/android/include',
+              ],
+            }],
           ],
         },
         {
           'target_name': 'linux_dumper_unittest_helper',
           'type': 'executable',
           'dependencies': [
             'breakpad_processor_support',
           ],
           'sources': [
             'src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc',
@@ skipping 194 matching lines @@
             'include_dirs': [
               '<(DEPTH)/third_party/GTM',
               '<(DEPTH)/third_party/GTM/Foundation',
             ],
           },
         },
       ],
     }],
   ],
 }