Skip to content

Commit

Permalink
Fix the Win64 GN installer config
Browse files Browse the repository at this point in the history
- Add the copy_first_run target (equivalent of https://cs.chromium.org/chromium/src/chrome/chrome_exe.gypi?q=%22First+run%22&sq=package:chromium&dr=C&l=462)
- Remove courgette.exe from the official Win64 archives as we're using courgette64.exe

BUG=628056

Review-Url: https://codereview.chromium.org/2152333002
Cr-Commit-Position: refs/heads/master@{#406173}
  • Loading branch information
sebmarchand authored and Commit bot committed Jul 19, 2016
1 parent 999676d commit f2a3e3a
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
9 changes: 9 additions & 0 deletions chrome/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ if (!is_android && !is_mac) {
deps += [
":chrome_dll",
":chrome_exe_version",
":copy_first_run",
":file_pre_reader",
":visual_elements_resources",
"//base",
Expand Down Expand Up @@ -445,6 +446,14 @@ if (is_win) {
}
}
}
copy("copy_first_run") {
sources = [
"app/firstRun",
]
outputs = [
"$root_out_dir/First Run",
]
}
} else if (is_mac) {
chrome_helper_name = chrome_product_full_name + " Helper"
chrome_framework_name = chrome_product_full_name + " Framework"
Expand Down
17 changes: 17 additions & 0 deletions courgette/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,23 @@ if (!is_ios) {
"//build/win:default_exe_manifest",
]
}

# The official build scripts expect courgette.exe to be in the official build
# archives but it's not clear if they really need it, copy courgette64.exe to
# courgette.exe to work around this. https://crbug.com/629243
if (is_win && current_cpu == "x64") {
copy("copy_courgette64_to_courgette") {
sources = [
"$root_out_dir/courgette64.exe",
]
outputs = [
"$root_out_dir/courgette.exe",
]
deps = [
":courgette",
]
}
}
}

test("courgette_unittests") {
Expand Down

0 comments on commit f2a3e3a

Please sign in to comment.