chore: update patches

electron · Aug 10, 2021 · edec614 · edec614
1 parent 64f3082
commit edec614
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 47 deletions.
diff --git a/patches/chromium/.patches b/patches/chromium/.patches
@@ -103,4 +103,3 @@ 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_build_on_woa.patch
diff --git a/patches/chromium/fix_build_on_woa.patch b/patches/chromium/fix_build_on_woa.patch
diff --git a/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch b/patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch
@@ -8,6 +8,28 @@ passed and the app was not run from the console, a console window would
 be created for each child process, despite logs being redirected to a
 file.
 
+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
 diff --git a/content/app/content_main.cc b/content/app/content_main.cc
 index a26c5c2e053eddb4c70afb166a4643f38eb3c7f6..265b9af981454ab09ed34542ca845fb566b4a75d 100644
 --- a/content/app/content_main.cc