Upstream crash changes for android.

chrome/chrome_browser.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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 913 matching lines @@
         'browser/content_settings/cookie_settings.cc',
         'browser/content_settings/cookie_settings.h',
         'browser/content_settings/host_content_settings_map.cc',
         'browser/content_settings/host_content_settings_map.h',
         'browser/content_settings/local_shared_objects_container.cc',
         'browser/content_settings/local_shared_objects_container.h',
         'browser/content_settings/tab_specific_content_settings.cc',
         'browser/content_settings/tab_specific_content_settings.h',
         'browser/cookies_tree_model.cc',
         'browser/cookies_tree_model.h',
-        'browser/crash_handler_host_linux.h',
         'browser/crash_upload_list.cc',
         'browser/crash_upload_list.h',
         'browser/crash_upload_list_win.cc',
         'browser/crash_upload_list_win.h',
         'browser/custom_handlers/protocol_handler_registry.cc',
         'browser/custom_handlers/protocol_handler_registry.h',
         'browser/custom_handlers/register_protocol_handler_infobar_delegate.cc',
         'browser/custom_handlers/register_protocol_handler_infobar_delegate.h',
         'browser/custom_home_pages_table_model.cc',
         'browser/custom_home_pages_table_model.h',
@@ skipping 3388 matching lines @@
             ['exclude', '^browser/ui/webui/keyboard_ui.*'],
             ['exclude', '^browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2.*'],
           ],
         }],
         ['os_posix == 1 and OS != "mac" and OS != "android"', {
           'link_settings': {
             'libraries': [
               '-lXss',
             ],
           },
+        }],
+        ['os_posix == 1 and OS != "mac"', {
+          'sources': [ 'browser/crash_handler_host_linuxish.h', ],
           'conditions': [
             ['linux_breakpad==1', {
               'sources': [
-                'app/breakpad_linux.cc',
-                'app/breakpad_linux.h',
-                'browser/crash_handler_host_linux.cc',
+                'app/breakpad_linuxish.cc',
+                'app/breakpad_linuxish.h',
+                'browser/crash_handler_host_linuxish.cc',
               ],
               'dependencies': [
                 '../breakpad/breakpad.gyp:breakpad_client',
                 # make sure file_version_info_linux.h is generated first.
                 'common',
               ],
               'include_dirs': [
-                # breakpad_linux.cc uses generated file_version_info_linux.h.
+                # breakpad_linuxish.cc uses generated file_version_info_linux.h.
                 '<(SHARED_INTERMEDIATE_DIR)',
                 '../breakpad/src',
               ],
             }, {  # linux_breakpad==0
               'sources': [
-                'browser/crash_handler_host_linux_stub.cc',
+                'browser/crash_handler_host_linuxish_stub.cc',
               ],
             }],
           ],
         }],
         ['OS=="linux" and use_aura==1', {
           'dependencies': [
             '../build/linux/system.gyp:dbus',
             '../build/linux/system.gyp:fontconfig',
             '../build/linux/system.gyp:x11',
             '../dbus/dbus.gyp:dbus',
@@ skipping 859 matching lines @@
       'type': 'static_library',
       'sources': [ 'browser/history/in_memory_url_index_cache.proto' ],
       'variables': {
         'proto_in_dir': 'browser/history',
         'proto_out_dir': 'chrome/browser/history',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }