Move Linux/Android breakpad implementation to breakpad component

components/breakpad.gypi

Index: components/breakpad.gypi
diff --git a/components/breakpad.gypi b/components/breakpad.gypi
index f7bdd98c6db21ccdf7f492f9ef37f5c41aa22035..124e56cb40b347b4bf441c9ecab8229f3bbdd3b3 100644
--- a/components/breakpad.gypi
+++ b/components/breakpad.gypi
@@ -9,21 +9,28 @@
     },
     'target_conditions': [
       ['breakpad_component_target==1', {
+        'defines': ['BREAKPAD_IMPLEMENTATION'],
         'sources': [
-          'breakpad/breakpad_client.cc',
-          'breakpad/breakpad_client.h',
-          'breakpad/breakpad_mac.h',
-          'breakpad/breakpad_mac.mm',
-          'breakpad/breakpad_win.cc',
-          'breakpad/breakpad_win.h',
-          'breakpad/hard_error_handler_win.cc',
-          'breakpad/hard_error_handler_win.h',
+          'breakpad/app/breakpad_client.cc',
+          'breakpad/app/breakpad_client.h',
+          'breakpad/app/breakpad_linux.cc',
+          'breakpad/app/breakpad_linux.h',
+          'breakpad/app/breakpad_linux_impl.h',
+          'breakpad/app/breakpad_mac.h',
+          'breakpad/app/breakpad_mac.mm',
+          'breakpad/app/breakpad_win.cc',
+          'breakpad/app/breakpad_win.h',
+          'breakpad/app/hard_error_handler_win.cc',
+          'breakpad/app/hard_error_handler_win.h',
         ],
       }],
     ],
   },
   'targets': [
     {
+      # Note: if you depend on this target, you need to either link in
+      # content.gyp:content_common, or add
+      # content/public/common/content_switches.cc to your sources.
       'target_name': 'breakpad_component',
       'type': 'static_library',
       'variables': {
@@ -36,7 +43,6 @@
         ['OS=="mac"', {
           'dependencies': [
             '../breakpad/breakpad.gyp:breakpad',
-            '../content/content.gyp:content_common',
           ],
         }],
         ['OS=="win"', {
@@ -46,6 +52,23 @@
             '../sandbox/sandbox.gyp:sandbox',
           ],
         }],
+        ['os_posix == 1 and OS != "mac" and OS != "ios"', {
+          'dependencies': [
+            '../breakpad/breakpad.gyp:breakpad_client',
+          ],
+          'include_dirs': [
+            '../breakpad/src',
+          ],
+        }],
+      ],
+      'target_conditions': [
+        # Need 'target_conditions' to override default filename_rules to include
+        # the files on Android.
+        ['OS=="android"', {
+          'sources/': [
+            ['include', '^breakpad/app/breakpad_linux\\.cc$'],
+          ],
+        }],
       ],
     },
   ],
@@ -70,6 +93,9 @@
     ['OS=="win" and target_arch=="ia32"', {
       'targets': [
         {
+          # Note: if you depend on this target, you need to either link in
+          # content.gyp:content_common, or add
+          # content/public/common/content_switches.cc to your sources.
           'target_name': 'breakpad_win64',
           'type': 'static_library',
           'variables': {
@@ -116,10 +142,43 @@
             '../base/base.gyp:base',
           ],
           'sources': [
-            'breakpad/breakpad_client.cc',
-            'breakpad/breakpad_client.h',
-            'breakpad/breakpad_mac.h',
-            'breakpad/breakpad_mac_stubs.mm',
+            'breakpad/app/breakpad_client.cc',
+            'breakpad/app/breakpad_client.h',
+            'breakpad/app/breakpad_mac.h',
+            'breakpad/app/breakpad_mac_stubs.mm',
+          ],
+        },
+      ],
+    }],
+    ['os_posix == 1 and OS != "mac" and OS != "ios"', {
+      'targets': [
+        {
+          'target_name': 'breakpad_host',
+          'type': 'static_library',
+          'dependencies': [
+            'breakpad_component',
+            '../base/base.gyp:base',
+            '../breakpad/breakpad.gyp:breakpad_client',
+            '../content/content.gyp:content_browser',
+            '../content/content.gyp:content_common',
+          ],
+          'sources': [
+            'breakpad/browser/crash_dump_manager_android.cc',
+            'breakpad/browser/crash_dump_manager_android.h',
+            'breakpad/browser/crash_handler_host_linux.cc',
+            'breakpad/browser/crash_handler_host_linux.h',
+          ],
+          'include_dirs': [
+            '../breakpad/src',
+          ],
+          'target_conditions': [
+            # Need 'target_conditions' to override default filename_rules to include
+            # the files on Android.
+            ['OS=="android"', {
+              'sources/': [
+                ['include', '^breakpad/browser/crash_handler_host_linux\\.cc$'],
+              ],
+            }],
           ],
         },
       ],