Skip to content

Commit

Permalink
Merge pull request #12211 from brave/pr12098_fix-windows-delta-update…
Browse files Browse the repository at this point in the history
…s_1.35.x

Fix windows delta updates (uplift to 1.35.x)
  • Loading branch information
kjozwiak authored Feb 10, 2022
2 parents dbb02dd + fb9d17c commit 74e7fbf
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 40 deletions.
18 changes: 9 additions & 9 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -57,24 +57,24 @@ if (!is_ios) {

if (is_win) {
# create_installer_archive.py assumes that last_chrome_installer folder has
# courgette.exe.
# courgette.exe. The original courgette.exe runs out of memory on Brave's
# binaries. As of January 2022, this seems to be a known issue and was
# confirmed by Chromium developers. The recommended workaround is to use
# another tool, Zucchini, as a drop-in replacement.
if (build_delta_installer) {
copy("copy_courgette_binary") {
copy("copy_zucchini_binary_as_courgette") {
visibility = [ ":mini_installer_dependencies" ]
sources = [ "$root_out_dir/courgette.exe" ]
outputs = [ "$root_out_dir/$last_chrome_installer/{{source_file_part}}" ]
deps = [
"//courgette",
"//courgette:copy_courgette_binaries",
]
sources = [ "$root_out_dir/zucchini.exe" ]
outputs = [ "$root_out_dir/$last_chrome_installer/courgette.exe" ]
deps = [ "//components/zucchini:zucchini" ]
}
}

group("mini_installer_dependencies") {
deps = [ ":brave" ]

if (build_delta_installer) {
deps += [ ":copy_courgette_binary" ]
deps += [ ":copy_zucchini_binary_as_courgette" ]
}
}
}
Expand Down
31 changes: 0 additions & 31 deletions chromium_src/courgette/third_party/bsdiff/paged_array.h

This file was deleted.

0 comments on commit 74e7fbf

Please sign in to comment.