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 201 matching lines @@
             'src/client/mac/handler/protected_memory_allocator.cc',
             'src/client/mac/handler/exception_handler.cc',
             'src/client/mac/Framework/Breakpad.mm',
             'src/client/mac/Framework/OnDemandServer.mm',
           ],
         },
       ],
     }],
     [ 'OS=="linux" or OS=="android"', {
       'conditions': [
-        ['OS=="android"', {
-          'defines': [
-            '__ANDROID__',

[digit1, 2012/08/27 21:20:30]

For the record, this was removed because this macro is defined by all Android
toolchains by default now.

-          ],
-        }],
         # Tools needed for archiving build symbols.
         ['linux_breakpad==1', {
           'targets': [
             {
               'target_name': 'minidump_stackwalk',
               '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': {
@@ skipping 128 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 104 matching lines @@
             'src/common/linux/memory_mapped_file.cc',
             'src/common/linux/memory_mapped_file.h',
             'src/common/linux/safe_readlink.cc',
             'src/common/linux/safe_readlink.h',
             'src/common/memory.h',
             'src/common/string_conversion.cc',
             'src/common/string_conversion.h',
           ],
 
           'conditions': [
-            # Android NDK toolchain doesn't support -mimplicit-it=always

[Mark Mentovai, 2012/08/27 21:13:10]

This was a recent addition, and you’re clobbering it. Any reason, or just
mistake?

[digit1, 2012/08/27 21:20:30]

I believe the NDK toolchain that is currently used by upstream (GCC 4.6 from NDK
r8b) does support this now, I'll look at the history for this line to be sure
though.

Note that the upstream Chrome for Android build uses toolchain binaries form
third_party/android-tools/ndk/, i.e. the toolchain binaries are
source-controlled to avoid issues when developers don't use exactly the right
version.

Again, let me check and get back to you.

[digit1, 2012/08/27 21:50:07]

Ok, I checked, the Android toolchain, even old ones, don't need this flag at
all. It looks like this is only required when building for a Linux/ARM platform
that is *not* Android, and thus using a different toolchain  I guess.

This patch doesn't exist in the downstream/internal Chrome for Android tree, but
it seems to have been comitted after the last merge of upstream Chromium into
our tree.

I'm a bit surprised, because "GNU as" has supported the "Unified Assembly
Language" syntax for ARM assembly, which is related to this flag, for a very
long time now, so the original author is either using a very dated toolchain, or
something a bit more custom.

Anyway, I'll keep this in a new patch. Sorry about that, and thanks for spotting
this. The comment above is certainly not correct, so I'll rephrase it.

-            ['target_arch=="arm" and OS!="android"', {
+            ['target_arch=="arm"', {
               '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': {

[Mark Mentovai, 2012/08/27 21:13:10]

It would be better if the headers that consumers outside of Breakpad rely on
didn’t need Breakpad’s fallback system-replacement headers. Is that possible?

[digit1, 2012/08/27 21:20:30]

Unfortunately, not at the moment. I plan to update the NDK headers so all the
things in this directory aren't needed anymore, but until this is publicly
available (and NDK releases take a notoriously long time for non-technical
reasons), this is the best we can do, without introducing plenty of #if
__ANDROID__ in the source code base.

[Mark Mentovai, 2012/08/27 21:30:33]

digit1 wrote:
Let’s leave a TODO here to remind us to clean it up whenever that becomes
possible.

+                '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',
             ],
           },
         },
       ],
     }],
   ],
 }