Skip to content

Commit

Permalink
More fixes for the Windows GN build.
Browse files Browse the repository at this point in the history
- symupload.exe is the same binary, but with the LargeAddressAware bit set (https://msdn.microsoft.com/en-us/library/wz223b1z.aspx)
- mini_installer_version.rc should be mini_installer_exe_version.rc and should be placed in the out directory (according to the GYP files).
- Cleaned up the courgette64 copy rule.

TBR=mark@chromium.org
BUG=629709

Review-Url: https://codereview.chromium.org/2173533002
Cr-Commit-Position: refs/heads/master@{#408162}
  • Loading branch information
sebmarchand authored and Commit bot committed Jul 27, 2016
1 parent 329d9b8 commit 37cfb34
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
Binary file modified breakpad/symupload.exe
Binary file not shown.
2 changes: 1 addition & 1 deletion chrome/installer/mini_installer/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ source_set("lib") {

process_version("version") {
template_file = "mini_installer_exe_version.rc.version"
output = "$target_gen_dir/mini_installer_version.rc"
output = "$root_out_dir/mini_installer_exe_version.rc"
}

source_set("unit_tests") {
Expand Down
8 changes: 5 additions & 3 deletions courgette/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -134,14 +134,16 @@ if (!is_ios) {
# Make sure that we have a copy of courgette64.exe in the root out
# directory.
copy("copy_courgette_binaries") {
courgette64_label = ":courgette(//build/toolchain/win:x64)"
courgette64_out_dir = get_label_info(courgette64_label, "root_out_dir")
sources = [
"$root_out_dir/x64/courgette64.exe",
"$courgette64_out_dir/courgette64.exe",
]
outputs = [
"$root_out_dir/courgette64.exe",
"$root_out_dir/{{source_file_part}}",
]
deps = [
":courgette(//build/toolchain/win:x64)",
courgette64_label,
]
}
}
Expand Down

0 comments on commit 37cfb34

Please sign in to comment.