Add breakpad component to GN build.

Comment the breakpad gyp file.

R=jamesr@chromium.org

Review URL: https://codereview.chromium.org/413863002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285055 0039d316-1c4b-4281-b951-d872f2087c98

breakpad/BUILD.gn

@@ -206,7 +206,7 @@ if (current_toolchain == host_toolchain && is_mac) {
 }
 
 if (is_mac) {
-  static_library("breakpad_utilities") {
+  static_library("utilities") {
     sources = [
       "src/client/mac/handler/breakpad_nlist_64.cc",
       "src/client/mac/handler/dynamic_images.cc",
@@ -248,7 +248,7 @@ if (is_mac) {
     ]
 
     deps = [
-      ":breakpad_utilities"
+      ":utilities"
     ]
   }
 
@@ -279,7 +279,7 @@ if (is_mac) {
     ]
 
     deps = [
-      ":breakpad_utilities",
+      ":utilities",
       ":crash_inspector",
       ":crash_report_sender",
     ]
@@ -362,13 +362,14 @@ if (is_linux && current_toolchain == host_toolchain) {
     include_dirs = [ "src" ]
   }
 
-  config("breakpad_client_config") {
+  config("client_config") {
+    include_dirs = [ "src" ]
     if (is_android) {
-      include_dirs = [ "src/common/android/include" ]
+      include_dirs += [ "src/common/android/include" ]
     }
   }
 
-  static_library("breakpad_client") {
+  static_library("client") {
     sources = [
       "src/client/linux/crash_generation/crash_generation_client.cc",
       "src/client/linux/crash_generation/crash_generation_client.h",
@@ -422,7 +423,7 @@ if (is_linux && current_toolchain == host_toolchain) {
 
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [ "//build/config/compiler:no_chromium_code" ]
-    direct_dependent_configs = [ ":breakpad_client_config" ]
+    direct_dependent_configs = [ ":client_config" ]
 
     # Android NDK toolchain doesn't support -mimplicit-it=always
     if (cpu_arch == "arm" && !is_android) {
@@ -448,7 +449,7 @@ if (is_linux && current_toolchain == host_toolchain) {
     ]
   }
 
-  static_library("breakpad_processor_support") {
+  static_library("processor_support") {
     sources = [
       "src/common/scoped_ptr.h",
       "src/processor/basic_code_modules.cc",
@@ -498,8 +499,8 @@ if (is_linux && current_toolchain == host_toolchain) {
     ]
 
     deps = [
-      ":breakpad_client",
-      ":breakpad_processor_support",
+      ":client",
+      ":processor_support",
       ":linux_dumper_unittest_helper",
       "//testing/gtest",
       "//testing/gtest:gtest_main",
@@ -534,7 +535,7 @@ if (is_linux && current_toolchain == host_toolchain) {
       "src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc",
     ]
     deps = [
-      ":breakpad_processor_support",
+      ":processor_support",
     ]
 
     include_dirs = [
@@ -556,7 +557,7 @@ if (is_linux && current_toolchain == host_toolchain) {
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [ "//build/config/compiler:no_chromium_code" ]
 
-    deps = [ ":breakpad_client" ]
+    deps = [ ":client" ]
 
     include_dirs = [ "src" ]
 
@@ -571,7 +572,7 @@ if (is_linux && current_toolchain == host_toolchain) {
 
     include_dirs = [ "src" ]
 
-    deps = [ ":breakpad_client" ]
+    deps = [ ":client" ]
   }
 
   executable("core-2-minidump") {
@@ -580,7 +581,7 @@ if (is_linux && current_toolchain == host_toolchain) {
     ]
 
     deps = [
-      ":breakpad_client",
+      ":client",
     ]
 
     include_dirs = [ "src" ]
@@ -588,7 +589,7 @@ if (is_linux && current_toolchain == host_toolchain) {
 }
 
 if (is_ios) {
-  static_library("breakpad_client") {
+  static_library("client") {
     sources = [
       "src/client/ios/Breakpad.h",
       "src/client/ios/Breakpad.mm",

breakpad/breakpad.gyp

@@ -13,6 +13,7 @@
     ['OS!="ios" and OS!="win"', {
       'targets': [
         {
+          # GN version: //breakpad:minidump_stackwalk
           'target_name': 'minidump_stackwalk',
           'type': 'executable',
           'includes': ['breakpad_tools.gypi'],
@@ -96,6 +97,7 @@
           ],
         },
         {
+          # GN version: //breakpad:minidump_dump
           'target_name': 'minidump_dump',
           'type': 'executable',
           'includes': ['breakpad_tools.gypi'],
@@ -129,6 +131,7 @@
       },
       'targets': [
         {
+          # GN version: //breakpad:dump_syms
           'target_name': 'dump_syms',
           'type': 'executable',
           'toolsets': ['host'],
@@ -194,6 +197,7 @@
           },
         },
         {
+          # GN version: //breakpad:symupload
           'target_name': 'symupload',
           'type': 'executable',
           'toolsets': ['host'],
@@ -228,6 +232,7 @@
       },
       'targets': [
         {
+          # GN version: //breakpad:utilities
           'target_name': 'breakpad_utilities',
           'type': 'static_library',
           'sources': [
@@ -250,6 +255,7 @@
           ],
         },
         {
+          # GN version: //breakpad:crash_inspector
           'target_name': 'crash_inspector',
           'type': 'executable',
           'variables': {
@@ -275,6 +281,7 @@
           }
         },
         {
+          # GN version: //breakpad:crash_report_sender
           'target_name': 'crash_report_sender',
           'type': 'executable',
           'mac_bundle': 1,
@@ -311,6 +318,7 @@
           }
         },
         {
+          # GN version: //breakpad
           'target_name': 'breakpad',
           'type': 'static_library',
           'dependencies': [
@@ -351,6 +359,7 @@
       # Tools needed for archiving build symbols.
       'targets': [
         {
+          # GN version: //breakpad:symupload
           'target_name': 'symupload',
           'type': 'executable',
 
@@ -372,6 +381,7 @@
           },
         },
         {
+          # GN version: //breakpad:dump_syms
           'target_name': 'dump_syms',
           'type': 'executable',
           'conditions': [
@@ -435,6 +445,7 @@
           ],
         },
         {
+          # GN version: //breakpad:client
           'target_name': 'breakpad_client',
           'type': 'static_library',
 
@@ -534,6 +545,7 @@
         },
         {
           # Breakpad r693 uses some files from src/processor in unit tests.
+          # GN version: //breakpad:processor_support
           'target_name': 'breakpad_processor_support',
           'type': 'static_library',
 
@@ -557,6 +569,7 @@
           ],
         },
         {
+          # GN version: //breakpad:breakpad_unittests
           'target_name': 'breakpad_unittests',
           'type': 'executable',
           'dependencies': [
@@ -623,6 +636,7 @@
           ],
         },
         {
+          # GN version: //breakpad:linux_dumper_unittest_helper
           'target_name': 'linux_dumper_unittest_helper',
           'type': 'executable',
           'dependencies': [
@@ -645,6 +659,7 @@
           ],
         },
         {
+          # GN version: //breakpad:generate_test_dump
           'target_name': 'generate_test_dump',
           'type': 'executable',
 
@@ -672,6 +687,7 @@
           ],
         },
         {
+          # GN version: //breakpad:minidump-2-core
           'target_name': 'minidump-2-core',
           'type': 'executable',
 
@@ -689,6 +705,7 @@
           ],
         },
         {
+          # GN version: //breakpad:core-2-minidump
           'target_name': 'core-2-minidump',
           'type': 'executable',
 
@@ -710,6 +727,7 @@
     ['OS=="ios"', {
       'targets': [
         {
+          # GN version: //breakpad:client
           'target_name': 'breakpad_client',
           'type': 'static_library',
           'sources': [

components/BUILD.gn

@@ -16,6 +16,8 @@ group("all_components") {
     "//components/bookmarks/browser",
     "//components/bookmarks/common",
     "//components/bookmarks/test",
+    "//components/breakpad/app",
+    "//components/breakpad/browser",
     "//components/captive_portal",
     "//components/cdm/browser",
     "//components/cdm/common",
@@ -106,6 +108,8 @@ group("all_components") {
       "//components/autofill/content/browser",  # Blocked on content/blink.
       "//components/autofill/content/common",  # Blocked on content.
       "//components/autofill/content/renderer",  # Blocked on content/blink.
+      "//components/breakpad/app",  # Should work, needs checking.
+      "//components/breakpad/browser",  # Should work, needs checking.
       "//components/captive_portal",  # Should work, needs checking.
       "//components/cloud_devices/common",  # Should work, needs checking.
       "//components/cdm/browser",  # Blocked on content.

components/breakpad.gypi

@@ -33,6 +33,8 @@
       # 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.
+      #
+      # GN version: //components/breakpad/app
       'target_name': 'breakpad_component',
       'type': '<(breakpad_component_target_type)',
       'sources': [
@@ -84,6 +86,7 @@
       ],
     },
     {
+      # GN version: //components/breakpad/app:test_support
       'target_name': 'breakpad_test_support',
       'type': 'none',
       'dependencies': [
@@ -100,6 +103,7 @@
     ['OS=="win"', {
       'targets': [
         {
+          # GN version: //components/breakpad/tools:crash_service
           'target_name': 'breakpad_crash_service',
           'type': 'static_library',
           'dependencies': [
@@ -194,6 +198,7 @@
     ['os_posix == 1 and OS != "mac" and OS != "ios" and android_webview_build != 1', {
       'targets': [
         {
+          # GN version: //components/breakpad/browser
           'target_name': 'breakpad_host',
           'type': 'static_library',
           'dependencies': [

components/breakpad/app/BUILD.gn

+# Copyright 2014 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.
+
+if (is_android) {
+  import("//build/config/android/config.gni")
+}
+
+source_set("lib") {
+  sources = [
+    "breakpad_client.cc",
+    "breakpad_client.h",
+    "crash_keys_win.cc",
+    "crash_keys_win.h",
+  ]
+}
+
+# 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.
+#
+# GYP version: components/breakpad.gyp:breakpad_component
+source_set("app") {
+  sources = [
+    "breakpad_linux_impl.h",
+    "breakpad_mac.h",
+    "breakpad_mac.mm",
+    "breakpad_win.cc",
+    "breakpad_win.h",
+    "hard_error_handler_win.cc",
+    "hard_error_handler_win.h",
+  ]
+  if (is_android || is_linux) {
+    # Want these files on both Linux and Android.
+    set_sources_assignment_filter([])
+    sources += [
+      "breakpad_linux.cc",
+      "breakpad_linux.h",
+    ]
+  }
+
+  defines = [ "BREAKPAD_IMPLEMENTATION" ]
+
+  deps = [
+    "//base",
+    ":lib",
+  ]
+
+  if (is_mac) {
+    deps += [ "//breakpad" ]
+  } else if (is_win) {
+    deps += [
+      "//sandbox",
+      #'../breakpad/breakpad.gyp:breakpad_handler',  TODO(GYP)
+      #'../breakpad/breakpad.gyp:breakpad_sender',  TODO(GYP)
+    ]
+  } else if (is_posix && !is_ios &&
+             (!is_android || !is_android_webview_build)) {
+    deps += [ "//breakpad:client" ]
+  }
+}
+
+source_set("test_support") {
+  deps = [ ":lib" ]
+}

components/breakpad/browser/BUILD.gn

+# Copyright 2014 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.
+
+source_set("browser") {
+  sources = [
+    "crash_dump_manager_android.cc",
+    "crash_dump_manager_android.h",
+  ]
+
+  if (is_linux || is_android) {
+    set_sources_assignment_filter([])
+    # Want this file on both Linux and Android.
+    sources += [
+      "crash_handler_host_linux.cc",
+      "crash_handler_host_linux.h",
+    ]
+  }
+
+  deps = [
+    "//base",
+    "//components/breakpad/app",
+    "//content/public/browser",
+    "//content/public/common",
+  ]
+
+  # This is not in the GYP build but this target includes breakpad client
+  # headers, so add the dependency here.
+  if (is_posix && !is_ios &&
+             (!is_android || !is_android_webview_build)) {
+    deps += [ "//breakpad:client" ]
+  }
+}

components/breakpad/tools/BUILD.gn

+# Copyright 2014 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.
+
+if (is_win) {
+  source_set("crash_service") {
+    sources = [
+      "crash_service.cc",
+      "crash_service.h",
+    ]
+
+    deps = [
+      "//base",
+      #'../breakpad/breakpad.gyp:breakpad_handler',  TODO(GYP)
+      #'../breakpad/breakpad.gyp:breakpad_sender',  TODO(GYP)
+    ]
+  }
+}

content/shell/BUILD.gn

@@ -199,6 +199,7 @@ static_library("content_shell_lib") {
     "//base/allocator",
     "//base/third_party/dynamic_annotations",
     "//cc",
+    "//components/breakpad/app",
     "//content:resources",
     "//content/gpu",
     "//content/ppapi_plugin",
@@ -230,7 +231,6 @@ static_library("content_shell_lib") {
     "//webkit/browser:storage",
     #'content.gyp:content_app_both',  TODO(GYP)
     #'copy_test_netscape_plugin',  TODO(GYP)
-    #'../components/components.gyp:breakpad_component',  TODO(GYP)
     #'../third_party/WebKit/public/blink.gyp:blink_test_support',  TODO(GYP)
   ]
 
@@ -260,7 +260,7 @@ static_library("content_shell_lib") {
   }
 
   if (is_posix && !is_mac && (!is_android || !is_android_webview_build)) {
-    #deps += [ '../components/components.gyp:breakpad_host' ]  TODO(GYP
+    deps += [ "//components/breakpad/browser" ]
   }
 
   if (use_aura) {