Upstream native crash handling changes for Android.

build/common.gypi

 # 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 595 matching lines @@
     'gtest_target_type%': 'executable',
 
     # Enable sampling based profiler.
     # See http://google-perftools.googlecode.com/svn/trunk/doc/cpuprofile.html
     'profiling%': '0',
 
     # Enable strict glibc debug mode.
     'glibcxx_debug%': 0,
 
     # Override whether we should use Breakpad on Linux. I.e. for Chrome bot.
-    'linux_breakpad%': 0,
+    'posix_breakpad%': 0,

[Mark Mentovai, 2012/04/05 14:28:03]

No.

[carlosvaldivia, 2012/04/05 18:35:56]

I'll get to it.

On 2012/04/05 14:28:03, Mark Mentovai wrote:

     # And if we want to dump symbols for Breakpad-enabled builds.
     'linux_dump_symbols%': 0,
     # And if we want to strip the binary after dumping symbols.
     'linux_strip_binary%': 0,
     # Strip the test binaries needed for Linux reliability tests.
     'linux_strip_reliability_tests%': 0,
 
     # Enable TCMalloc.
     'linux_use_tcmalloc%': 1,
 
@@ skipping 97 matching lines @@
         'disable_nacl%': 0,
       }],
       ['os_posix==1 and OS!="mac" and OS!="android"', {
         # This will set gcc_version to XY if you are running gcc X.Y.*.
         # This is used to tweak build flags for gcc 4.4.
         'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
         # Figure out the python architecture to decide if we build pyauto.
         'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/<(system_libdir)/libpython<(python_ver).so.1.0)',
         'conditions': [
           ['branding=="Chrome"', {
-            'linux_breakpad%': 1,
+            'posix_breakpad%': 1,
           }],
           # All Chrome builds have breakpad symbols, but only process the
           # symbols from official builds.
           ['(branding=="Chrome" and buildtype=="Official")', {
             'linux_dump_symbols%': 1,
           }],
         ],
       }],  # os_posix==1 and OS!="mac" and OS!="android"
       ['OS=="android"', {
         # Location of Android NDK.
         'variables': {
           'variables': {
             'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)',
             'android_target_arch%': 'arm',  # target_arch in android terms.
 
             # Switch between different build types, currently only '0' is
             # supported.
             'android_build_type%': 0,
           },
           'android_ndk_root%': '<(android_ndk_root)',
           'android_ndk_sysroot': '<(android_ndk_root)/platforms/android-9/arch-<(android_target_arch)',
           'android_build_type%': '<(android_build_type)',
         },
         'android_ndk_root%': '<(android_ndk_root)',
         'android_ndk_sysroot': '<(android_ndk_sysroot)',
         'android_ndk_include': '<(android_ndk_sysroot)/usr/include',
         'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib',
 
         # Uses Android's crash report system
-        'linux_breakpad%': 0,
+        'posix_breakpad%': 0,
 
         # Always uses openssl.
         'use_openssl%': 1,
 
         'proprietary_codecs%': '<(proprietary_codecs)',
         'safe_browsing%': 0,
         'configuration_policy%': 0,
         'input_speech%': 0,
         'enable_web_intents%': 0,
         'java_bridge%': 1,
@@ skipping 1302 matching lines @@
               '-w',
               '-mllvm', '-asan-blacklist=<(asan_blacklist)',
             ],
             'ldflags': [
               '-faddress-sanitizer',
             ],
             'defines': [
               'ADDRESS_SANITIZER',
             ],
           }],
-          ['linux_breakpad==1', {
+          ['posix_breakpad==1', {
             'cflags': [ '-g' ],
-            'defines': ['USE_LINUX_BREAKPAD'],
+            'defines': ['USE_POSIX_BREAKPAD'],
           }],
           ['linux_use_heapchecker==1', {
             'variables': {'linux_use_tcmalloc%': 1},
             'defines': ['USE_HEAPCHECKER'],
           }],
           ['linux_use_tcmalloc==0', {
             'defines': ['NO_TCMALLOC'],
           }],
           ['linux_keep_shadow_stacks==1', {
             'defines': ['KEEP_SHADOW_STACKS'],
@@ skipping 825 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }