From f622bd992782842978292e70bcab41a92df33623 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 12:50:12 -0400 Subject: [PATCH] build: re-enable partition alloc on mac (#40230) * build: re-enable partition alloc on mac Co-authored-by: VerteDinde * Trigger Build --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: VerteDinde Co-authored-by: John Kleinschmidt --- patches/chromium/.patches | 1 - ...build_disable_partition_alloc_on_mac.patch | 23 ------------------- 2 files changed, 24 deletions(-) delete mode 100644 patches/chromium/build_disable_partition_alloc_on_mac.patch diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 0bbfcc0f820c5..ceb13a49dfc92 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -90,7 +90,6 @@ fix_adapt_exclusive_access_for_electron_needs.patch fix_aspect_ratio_with_max_size.patch fix_crash_when_saving_edited_pdf_files.patch port_autofill_colors_to_the_color_pipeline.patch -build_disable_partition_alloc_on_mac.patch fix_non-client_mouse_tracking_and_message_bubbling_on_windows.patch build_make_libcxx_abi_unstable_false_for_electron.patch introduce_ozoneplatform_electron_can_call_x11_property.patch diff --git a/patches/chromium/build_disable_partition_alloc_on_mac.patch b/patches/chromium/build_disable_partition_alloc_on_mac.patch deleted file mode 100644 index bf6d5b1089138..0000000000000 --- a/patches/chromium/build_disable_partition_alloc_on_mac.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: VerteDinde -Date: Tue, 1 Mar 2022 12:07:25 -0800 -Subject: build: disable partition alloc on mac - -Enabling partition alloc caused a crash when spawning -a child process. This patch disables partition alloc for mac, -and can be removed when the crash in fork is resolved. -Related issue: https://github.com/electron/electron/issues/32718 - -diff --git a/build_overrides/partition_alloc.gni b/build_overrides/partition_alloc.gni -index a6306a0e042d9fa58568d690fdc76f973782299f..72e47348b644d49e1f63b0693fad01df3bb24f01 100644 ---- a/build_overrides/partition_alloc.gni -+++ b/build_overrides/partition_alloc.gni -@@ -46,7 +46,7 @@ _disable_partition_alloc_everywhere = - if (is_ios) { - _is_partition_alloc_everywhere_platform = ios_partition_alloc_enabled - } else { -- _is_partition_alloc_everywhere_platform = !is_nacl -+ _is_partition_alloc_everywhere_platform = !is_nacl && !is_mac - } - - # Under Windows debug build, the allocator shim is not compatible with CRT.