From c4109803d74f90f05344e9441ac0ff577acb820f Mon Sep 17 00:00:00 2001
From: Henrique Ferreiro <hferreiro@igalia.com>
Date: Tue, 11 Nov 2025 18:09:06 -0800
Subject: [PATCH] Reland "[gclient] Enable parallel sync on ARM Mac by default"

This reverts commit 8f4d3df0bcdd356c0b1d95e4a5eab4da5b4da3a1.

Reason for revert: no longer an issue on current git.

Original change's description:
> Revert "[gclient] Enable parallel sync on ARM Mac by default"
>
> This reverts commit 92b780b0bd13d0ed5f9aa821f0b91f989fb188de.
>
> Reason for revert: mac arm experiencing hang
>
> Original change's description:
> > [gclient] Enable parallel sync on ARM Mac by default
> >
> > I realized that gclient sync doesn't use all the cores on ARM Mac.
> > This CL changes the default for ARM Mac to use all the available cores.
> >
> > Change-Id: Id0316e48d2b16a05a397a69bad53172b3d742f4a
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5256559
> > Commit-Queue: Junji Watanabe <jwata@google.com>
> > Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
> > Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
> > Auto-Submit: Junji Watanabe <jwata@google.com>
>
> Bug: 1427050
> Change-Id: I512d1d1ef0034f12fc9054c5234ae688ec281857
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5259766
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Auto-Submit: Josip Sokcevic <sokcevic@chromium.org>
> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>

Bug: 40261607
Change-Id: If46b9d98ec65e3e8424ec0b4637834772a372c0f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/7137402
Reviewed-by: Gavin Mak <gavinmak@google.com>
Reviewed-by: Junji Watanabe <jwata@google.com>
Commit-Queue: Junji Watanabe <jwata@google.com>
---
 gclient.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gclient.py b/gclient.py
index c6be687631..1cc8fb8da0 100755
--- a/gclient.py
+++ b/gclient.py
@@ -4549,7 +4549,8 @@ class OptionParser(optparse.OptionParser):
                                        **kwargs)
 
         # Some arm boards have issues with parallel sync.
-        if platform.machine().startswith('arm'):
+        # ARM Mac should be fine.
+        if sys.platform != 'darwin' and platform.machine().startswith('arm'):
             jobs = 1
         else:
             jobs = max(8, gclient_utils.NumLocalCpus())