Roll Breakpad to release 1020

breakpad/breakpad.gyp

Index: breakpad/breakpad.gyp
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp
index 1cc4e435c56da23a9988c2e9ee8d20f0b459b134..a5c02fccc831f7860df60b5a7847505c79cef59b 100644
--- a/breakpad/breakpad.gyp
+++ b/breakpad/breakpad.gyp
@@ -372,6 +372,7 @@
             {
               '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.
@@ -398,6 +399,7 @@
               ],
               'include_dirs': [
                 'src',
+                'src/third_party',
               ],
               'link_settings': {
                 'libraries': [
@@ -527,10 +529,14 @@
               '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',
+                ],
+              },
             }],
           ],
 
@@ -621,6 +627,14 @@
                 '-Wno-unused-value',
               ],
             }],
+            ['OS=="android"', {
+              'libraries': [
+                '-llog',
+              ],
+              'include_dirs': [
+                'src/common/android/include',
+              ],
+            }],
           ],
         },
         {