win/32-bit: copy courgette64.exe.pdb and gcp_portmon64.dll.pdb to the…

… root build dir. The binary itself was already being copied over, and since the binaries now contain only the basename of the pdb, the pdb must be next to it for the symbol upload scripts to work. TBR=pastarmovj,wfh Bug: 894725 Change-Id: If57fda6a8e4610994b948a0e628dac750a3ff7ad Reviewed-on: https://chromium-review.googlesource.com/c/1279373 Reviewed-by: Nico Weber <[email protected]> Commit-Queue: Nico Weber <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#599513}(cherry picked from commit c13a10b) Reviewed-on: https://chromium-review.googlesource.com/c/1279951 Reviewed-by: Michael Moss <[email protected]> Cr-Commit-Position: refs/branch-heads/3578@{#10} Cr-Branched-From: 4226ddf-refs/heads/master@{#599034}
nwjs · Oct 13, 2018 · 416144e · 416144e
1 parent 9f374b8
commit 416144e
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 17 deletions.
diff --git a/cloud_print/virtual_driver/win/port_monitor/BUILD.gn b/cloud_print/virtual_driver/win/port_monitor/BUILD.gn
@@ -60,22 +60,36 @@ if (current_cpu == "x64") {
 } else {
   # Make sure that we have a copy of gcp_portmon64.dll in the root out
   # directory.
-  copy("copy_gcp_portmon_dll") {
-    if (is_clang) {
-      gcp_portmon64_toolchain = "//build/toolchain/win:win_clang_x64"
-    } else {
-      gcp_portmon64_toolchain = "//build/toolchain/win:x64"
-    }
-    gcp_portmon64_label = ":port_monitor_dll($gcp_portmon64_toolchain)"
+  if (is_clang) {
+    gcp_portmon64_toolchain = "//build/toolchain/win:win_clang_x64"
+  } else {
+    gcp_portmon64_toolchain = "//build/toolchain/win:x64"
+  }
+  gcp_portmon64_label = ":port_monitor_dll($gcp_portmon64_toolchain)"
 
-    gcp_portmon64_out_dir = get_label_info(gcp_portmon64_label, "root_out_dir")
+  gcp_portmon64_out_dir = get_label_info(gcp_portmon64_label, "root_out_dir")
+
+  copy("copy_gcp_portmon_pdb") {
+    visibility = [ ":copy_gcp_portmon_dll" ]
+    sources = [
+      "$gcp_portmon64_out_dir/gcp_portmon64.dll.pdb",
+    ]
+    outputs = [
+      "$root_out_dir/{{source_file_part}}",
+    ]
+    deps = [
+      gcp_portmon64_label,
+    ]
+  }
+  copy("copy_gcp_portmon_dll") {
     sources = [
       "$gcp_portmon64_out_dir/gcp_portmon64.dll",
     ]
     outputs = [
       "$root_out_dir/{{source_file_part}}",
     ]
     deps = [
+      ":copy_gcp_portmon_pdb",
       gcp_portmon64_label,
     ]
   }

diff --git a/courgette/BUILD.gn b/courgette/BUILD.gn
@@ -176,24 +176,39 @@ if (!is_ios) {
         ]
       }
     } else {
-      # Make sure that we have a copy of courgette64.exe in the root out
+      # Make sure that we have a copy of courgette64.exe(.pdb) in the root out
       # directory.
-      copy("copy_courgette_binaries") {
-        if (is_clang) {
-          courgette64_toolchain = "//build/toolchain/win:win_clang_x64"
-        } else {
-          courgette64_toolchain = "//build/toolchain/win:x64"
-        }
-        courgette64_label = ":courgette($courgette64_toolchain)"
+      if (is_clang) {
+        courgette64_toolchain = "//build/toolchain/win:win_clang_x64"
+      } else {
+        courgette64_toolchain = "//build/toolchain/win:x64"
+      }
+      courgette64_label = ":courgette($courgette64_toolchain)"
+
+      courgette64_out_dir = get_label_info(courgette64_label, "root_out_dir")
+
+      copy("copy_courgette_pdb") {
+        visibility = [ ":copy_courgette_binaries" ]
+        sources = [
+          "$courgette64_out_dir/courgette64.exe.pdb",
+        ]
+        outputs = [
+          "$root_out_dir/{{source_file_part}}",
+        ]
+        deps = [
+          courgette64_label,
+        ]
+      }
 
-        courgette64_out_dir = get_label_info(courgette64_label, "root_out_dir")
+      copy("copy_courgette_binaries") {
         sources = [
           "$courgette64_out_dir/courgette64.exe",
         ]
         outputs = [
           "$root_out_dir/{{source_file_part}}",
         ]
         deps = [
+          ":copy_courgette_pdb",
           courgette64_label,
         ]
       }