Skip to content

Commit

Permalink
chore: fix the build on Windows on ARM
Browse files Browse the repository at this point in the history
  • Loading branch information
ckerr committed Aug 10, 2021
1 parent 0fb6ff1 commit f55b4d9
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 0 deletions.
1 change: 1 addition & 0 deletions patches/chromium/.patches
Expand Up @@ -103,3 +103,4 @@ hack_to_allow_gclient_sync_with_host_os_mac_on_linux_in_ci.patch
don_t_run_pcscan_notifythreadcreated_if_pcscan_is_disabled.patch
add_gin_wrappable_crash_key.patch
logging_win32_only_create_a_console_if_logging_to_stderr.patch
fix_fix_the_build_on_windows_on_arm.patch
34 changes: 34 additions & 0 deletions patches/chromium/fix_fix_the_build_on_windows_on_arm.patch
@@ -0,0 +1,34 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Tue, 10 Aug 2021 11:54:41 -0500
Subject: fix: Fix the build on Windows on ARM

https://chromium-review.googlesource.com/c/chromium/src/+/3056003

Cherry-picking this upstream fix because the roll has been paused for
a long time and this appears to be the only blocker remaining before the
current roller-bot PR goes green, so the risk/reward of bumping DEPS
leans in favor of merging what we've got before unpausing.

diff --git a/chrome/installer/util/additional_parameters.cc b/chrome/installer/util/additional_parameters.cc
index 275c635154111521a27a174b590685062021a09d..ddddd5bbfb4058b10d6cb21f69216b5fd5940e21 100644
--- a/chrome/installer/util/additional_parameters.cc
+++ b/chrome/installer/util/additional_parameters.cc
@@ -201,6 +201,8 @@ std::wstring GetChannelIdentifier(version_info::Channel channel,
static constexpr base::WStringPiece kArchSuffix = L"-arch_x64";
#elif defined(ARCH_CPU_X86)
static constexpr base::WStringPiece kArchSuffix = L"-arch_x86";
+#elif defined(ARCH_CPU_ARM64)
+ static constexpr base::WStringPiece kArchSuffix = L"-arch_arm64";
#else
#error unsupported processor architecture.
#endif
@@ -236,6 +238,8 @@ std::wstring GetChannelIdentifier(version_info::Channel channel,
return L"x64-stable";
#elif defined(ARCH_CPU_X86)
return L"stable-arch_x86";
+#elif defined(ARCH_CPU_ARM64)
+ return L"stable-arch_arm64";
#else
#error unsupported processor architecture.
#endif

0 comments on commit f55b4d9

Please sign in to comment.