From 1ae3d20332f03c6fa5ea7fa4ee421ebdf2d5b2ef Mon Sep 17 00:00:00 2001
From: keyonghan <54558023+keyonghan@users.noreply.github.com>
Date: Mon, 25 Sep 2023 08:56:46 -0700
Subject: [PATCH] Switch goma to reclient for Linux host engine targets
 (#45884)

Part of https://github.com/flutter/flutter/issues/132701
---
 ci/builders/linux_arm_host_engine.json     | 12 +++++++++---
 ci/builders/linux_host_desktop_engine.json | 12 +++++++++---
 ci/builders/linux_host_engine.json         | 20 +++++++++++++++-----
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/ci/builders/linux_arm_host_engine.json b/ci/builders/linux_arm_host_engine.json
index 2c85d9b84a6a0..72472c095d9ee 100644
--- a/ci/builders/linux_arm_host_engine.json
+++ b/ci/builders/linux_arm_host_engine.json
@@ -25,7 +25,9 @@
                 "--no-lto",
                 "--target-os=linux",
                 "--linux-cpu=arm64",
-                "--prebuilt-dart-sdk"
+                "--prebuilt-dart-sdk",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "linux_profile_arm64",
             "ninja": {
@@ -62,7 +64,9 @@
                 "debug",
                 "--target-os=linux",
                 "--linux-cpu=arm64",
-                "--prebuilt-dart-sdk"
+                "--prebuilt-dart-sdk",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "linux_debug_arm64",
             "ninja": {
@@ -99,7 +103,9 @@
                 "release",
                 "--target-os=linux",
                 "--linux-cpu=arm64",
-                "--prebuilt-dart-sdk"
+                "--prebuilt-dart-sdk",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "linux_release_arm64",
             "ninja": {
diff --git a/ci/builders/linux_host_desktop_engine.json b/ci/builders/linux_host_desktop_engine.json
index 55a45cdb2f884..cd455efffebe7 100644
--- a/ci/builders/linux_host_desktop_engine.json
+++ b/ci/builders/linux_host_desktop_engine.json
@@ -23,7 +23,9 @@
                 "--runtime-mode",
                 "debug",
                 "--enable-fontconfig",
-                "--prebuilt-dart-sdk"
+                "--prebuilt-dart-sdk",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "host_debug",
             "ninja": {
@@ -57,7 +59,9 @@
                 "profile",
                 "--no-lto",
                 "--enable-fontconfig",
-                "--prebuilt-dart-sdk"
+                "--prebuilt-dart-sdk",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "host_profile",
             "ninja": {
@@ -90,7 +94,9 @@
                 "--runtime-mode",
                 "release",
                 "--enable-fontconfig",
-                "--prebuilt-dart-sdk"
+                "--prebuilt-dart-sdk",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "host_release",
             "ninja": {
diff --git a/ci/builders/linux_host_engine.json b/ci/builders/linux_host_engine.json
index aae0ac2835190..38846c70e5286 100644
--- a/ci/builders/linux_host_engine.json
+++ b/ci/builders/linux_host_engine.json
@@ -13,7 +13,9 @@
                 "--runtime-mode",
                 "debug",
                 "--unoptimized",
-                "--prebuilt-dart-sdk"
+                "--prebuilt-dart-sdk",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "host_debug_unopt",
             "ninja": {
@@ -39,7 +41,9 @@
                 "--unoptimized",
                 "--prebuilt-dart-sdk",
                 "--target-dir",
-                "host_debug_impeller_vulkan"
+                "host_debug_impeller_vulkan",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "host_debug_impeller_vulkan",
             "ninja": {
@@ -91,7 +95,9 @@
                 "--runtime-mode",
                 "debug",
                 "--prebuilt-dart-sdk",
-                "--build-embedder-examples"
+                "--build-embedder-examples",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "host_debug",
             "ninja": {
@@ -142,7 +148,9 @@
                 "profile",
                 "--no-lto",
                 "--prebuilt-dart-sdk",
-                "--build-embedder-examples"
+                "--build-embedder-examples",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "host_profile",
             "ninja": {
@@ -192,7 +200,9 @@
                 "--runtime-mode",
                 "release",
                 "--prebuilt-dart-sdk",
-                "--build-embedder-examples"
+                "--build-embedder-examples",
+                "--rbe",
+                "--no-goma"
             ],
             "name": "host_release",
             "ninja": {