From fac8af48902a4e9c53d4fc008f00d1cc8bf985f9 Mon Sep 17 00:00:00 2001
From: keyonghan <54558023+keyonghan@users.noreply.github.com>
Date: Mon, 25 Sep 2023 08:56:48 -0700
Subject: [PATCH] Switch goma to reclient for Linux fuchsia/unopt/android_aot
 (flutter/engine#45899)

Part of https://github.com/flutter/flutter/issues/132701
---
 .../ci/builders/linux_android_aot_engine.json | 24 ++++++++++++++-----
 .../flutter/ci/builders/linux_fuchsia.json    | 24 ++++++++++++++-----
 .../src/flutter/ci/builders/linux_unopt.json  |  8 +++++--
 3 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/engine/src/flutter/ci/builders/linux_android_aot_engine.json b/engine/src/flutter/ci/builders/linux_android_aot_engine.json
index 5065d6781d..cb2bccd61a 100644
--- a/engine/src/flutter/ci/builders/linux_android_aot_engine.json
+++ b/engine/src/flutter/ci/builders/linux_android_aot_engine.json
@@ -24,7 +24,9 @@
                 "profile",
                 "--android",
                 "--android-cpu",
-                "arm"
+                "arm",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_profile",
             "ninja": {
@@ -61,7 +63,9 @@
                 "release",
                 "--android",
                 "--android-cpu",
-                "arm"
+                "arm",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_release",
             "ninja": {
@@ -99,7 +103,9 @@
                 "release",
                 "--android",
                 "--android-cpu",
-                "arm64"
+                "arm64",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_release_arm64",
             "ninja": {
@@ -152,7 +158,9 @@
                 "--runtime-mode",
                 "profile",
                 "--android-cpu",
-                "arm64"
+                "arm64",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_profile_arm64",
             "ninja": {
@@ -190,7 +198,9 @@
                 "profile",
                 "--android",
                 "--android-cpu",
-                "x64"
+                "x64",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_profile_x64",
             "ninja": {
@@ -228,7 +238,9 @@
                 "release",
                 "--android",
                 "--android-cpu",
-                "x64"
+                "x64",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_release_x64",
             "ninja": {
diff --git a/engine/src/flutter/ci/builders/linux_fuchsia.json b/engine/src/flutter/ci/builders/linux_fuchsia.json
index e79853486b..a537568254 100644
--- a/engine/src/flutter/ci/builders/linux_fuchsia.json
+++ b/engine/src/flutter/ci/builders/linux_fuchsia.json
@@ -14,7 +14,9 @@
                 "--fuchsia-cpu",
                 "arm64",
                 "--runtime-mode",
-                "profile"
+                "profile",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "fuchsia_profile_arm64",
             "ninja": {
@@ -38,7 +40,9 @@
                 "--fuchsia-cpu",
                 "arm64",
                 "--runtime-mode",
-                "release"
+                "release",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "fuchsia_release_arm64",
             "ninja": {
@@ -63,7 +67,9 @@
                 "arm64",
                 "--runtime-mode",
                 "debug",
-                "--no-lto"
+                "--no-lto",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "fuchsia_debug_arm64",
             "ninja": {
@@ -87,7 +93,9 @@
                 "--fuchsia-cpu",
                 "x64",
                 "--runtime-mode",
-                "profile"
+                "profile",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "fuchsia_profile_x64",
             "ninja": {
@@ -110,7 +118,9 @@
                 "--fuchsia-cpu",
                 "x64",
                 "--runtime-mode",
-                "release"
+                "release",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "fuchsia_release_x64",
             "ninja": {
@@ -134,7 +144,9 @@
                 "x64",
                 "--runtime-mode",
                 "debug",
-                "--no-lto"
+                "--no-lto",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "fuchsia_debug_x64",
             "ninja": {
diff --git a/engine/src/flutter/ci/builders/linux_unopt.json b/engine/src/flutter/ci/builders/linux_unopt.json
index 4274c03223..bdc93f0816 100644
--- a/engine/src/flutter/ci/builders/linux_unopt.json
+++ b/engine/src/flutter/ci/builders/linux_unopt.json
@@ -13,7 +13,9 @@
                 "--prebuilt-dart-sdk",
                 "--asan",
                 "--lsan",
-                "--dart-debug"
+                "--dart-debug",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "host_debug_unopt",
             "ninja": {
@@ -89,7 +91,9 @@
             ],
             "gn": [
                 "--android",
-                "--unoptimized"
+                "--unoptimized",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "android_debug_unopt",
             "ninja": {