[build] Switch back rpmalloc to upstream revision. Now that the original issue has been fixed upstream, there is no need to depend on a local fork, so adjust the RPMALLOC_REVISION constant in infra/recipes/gn.py. For context, see https://gn-review.googlesource.com/c/gn/+/11840 Change-Id: Id7e476ee6d122e966bdc0a171b39bd5ae35019bb Reviewed-on: https://gn-review.googlesource.com/c/gn/+/11860 Reviewed-by: Petr Hosek <phosek@google.com> Commit-Queue: David Turner <digit@google.com>

diff --git a/infra/README.recipes.md b/infra/README.recipes.md
index b4cb63d..fabdf85 100644
--- a/infra/README.recipes.md
+++ b/infra/README.recipes.md

@@ -93,7 +93,7 @@
 
 Recipe for building GN.
 
-&mdash; **def [RunSteps](/infra/recipes/gn.py#106)(api, repository):**
+&mdash; **def [RunSteps](/infra/recipes/gn.py#102)(api, repository):**
 ### *recipes* / [macos\_sdk:examples/full](/infra/recipe_modules/macos_sdk/examples/full.py)
 
 [DEPS](/infra/recipe_modules/macos_sdk/examples/full.py#5): [macos\_sdk](#recipe_modules-macos_sdk), [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step]

diff --git a/infra/recipes/gn.expected/ci_linux.json b/infra/recipes/gn.expected/ci_linux.json
index 071bfb7..128c0e6 100644
--- a/infra/recipes/gn.expected/ci_linux.json
+++ b/infra/recipes/gn.expected/ci_linux.json

@@ -116,7 +116,7 @@
       "fetch",
       "--tags",
       "https://fuchsia.googlesource.com/third_party/github.com/mjansson/rpmalloc",
-      "60f7c6701d41c4452848bf0002cb27664aac0146"
+      "f4b7c52c858675f732a76bd1c73447e0fcf84b1e"
     ],
     "cwd": "[START_DIR]/rpmalloc",
     "infra_step": true,

diff --git a/infra/recipes/gn.expected/cipd_exists.json b/infra/recipes/gn.expected/cipd_exists.json
index 495c5c3..9d2811d 100644
--- a/infra/recipes/gn.expected/cipd_exists.json
+++ b/infra/recipes/gn.expected/cipd_exists.json

@@ -116,7 +116,7 @@
       "fetch",
       "--tags",
       "https://fuchsia.googlesource.com/third_party/github.com/mjansson/rpmalloc",
-      "60f7c6701d41c4452848bf0002cb27664aac0146"
+      "f4b7c52c858675f732a76bd1c73447e0fcf84b1e"
     ],
     "cwd": "[START_DIR]/rpmalloc",
     "infra_step": true,

diff --git a/infra/recipes/gn.expected/cipd_register.json b/infra/recipes/gn.expected/cipd_register.json
index b80f07a..425046a 100644
--- a/infra/recipes/gn.expected/cipd_register.json
+++ b/infra/recipes/gn.expected/cipd_register.json

@@ -116,7 +116,7 @@
       "fetch",
       "--tags",
       "https://fuchsia.googlesource.com/third_party/github.com/mjansson/rpmalloc",
-      "60f7c6701d41c4452848bf0002cb27664aac0146"
+      "f4b7c52c858675f732a76bd1c73447e0fcf84b1e"
     ],
     "cwd": "[START_DIR]/rpmalloc",
     "infra_step": true,

diff --git a/infra/recipes/gn.expected/cq_linux.json b/infra/recipes/gn.expected/cq_linux.json
index 22c9f50..4e32325 100644
--- a/infra/recipes/gn.expected/cq_linux.json
+++ b/infra/recipes/gn.expected/cq_linux.json

@@ -143,7 +143,7 @@
       "fetch",
       "--tags",
       "https://fuchsia.googlesource.com/third_party/github.com/mjansson/rpmalloc",
-      "60f7c6701d41c4452848bf0002cb27664aac0146"
+      "f4b7c52c858675f732a76bd1c73447e0fcf84b1e"
     ],
     "cwd": "[START_DIR]/rpmalloc",
     "infra_step": true,

diff --git a/infra/recipes/gn.py b/infra/recipes/gn.py
index 37c99d7..6ba79ae 100644
--- a/infra/recipes/gn.py
+++ b/infra/recipes/gn.py

@@ -27,12 +27,8 @@
 }
 
 # On select platforms, link the GN executable against rpmalloc for a small 10% speed boost.
-# TODO: This uses a local patch on the Fuchsia github mirror, switch back to
-# upstream revision once https://github.com/mjansson/rpmalloc/pull/246 has
-# landed. The current revision comes from:
-# https://fuchsia-review.googlesource.com/c/third_party/github.com/mjansson/rpmalloc/+/546001
 RPMALLOC_GIT_URL = 'https://fuchsia.googlesource.com/third_party/github.com/mjansson/rpmalloc'
-RPMALLOC_REVISION = '60f7c6701d41c4452848bf0002cb27664aac0146'
+RPMALLOC_REVISION = 'f4b7c52c858675f732a76bd1c73447e0fcf84b1e'
 
 # Used to convert os and arch strings to rpmalloc format
 RPMALLOC_MAP = {