[go: nahoru, domu]

Add chrome crash service to GN build on Windows.

This adds a chrome crash_service target that matches the target arch, and a *_win64 version when compiling 32-bit targets.

Previosly we had a crash_service.exe target that was actually the content_shell one with the wrong name. Various code referred to this target when some meant the chrome one, and some meant the content one. This patch fixes the naming and updates the references to use the correct one.

Fixes cross-compiling of generated buildflag headers. It was computing the output directory incorrectly.

BUG=537009

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

Cr-Commit-Position: refs/heads/master@{#362826}
diff --git a/BUILD.gn b/BUILD.gn
index 1637b803..f160eb2 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -560,7 +560,6 @@
       "//chrome_elf:dll_hash_main",
       "//cloud_print:cloud_print_unittests",
       "//cloud_print/service/win:cloud_print_service",
-      "//components/crash/content/tools:crash_service",
       "//components/wifi:wifi_test",
       "//net:quic_client",
       "//net:quic_server",
@@ -785,7 +784,7 @@
     if (is_win) {
       deps += [
         "//components/test_runner:layout_test_helper",
-        "//content/shell:crash_service",
+        "//content/shell:content_shell_crash_service",
       ]
     }
 
@@ -844,14 +843,12 @@
 
     if (is_win) {
       deps += [
-        "//content/shell:crash_service",
+        "//chrome/tools/crash_service",
         # "//gpu:angle_perftests", TODO(GYP): crbug.com/537008
       ]
 
       if (target_cpu == "x86") {
-        deps += [
-          # "//content/shell:crash_service_win64", TODO(GYP): crbug.com/537009
-        ]
+        deps += [ "//chrome/tools/crash_service:crash_service_win64" ]
       }
     } else {
       deps += [ "//breakpad:minidump_stackwalk($host_toolchain)" ]