Skip to content

Commit 6bf8067

Browse files
keyonghankeyonghan
authored
Restore goma from rbe before 3.16 branching (#46272)
This is a revert of targets that generate artifacts for framework: ``` Linux linux_fuchsia Linux linux_android_aot_engine Linux linux_android_debug_engine Linux linux_arm_host_engine Linux linux_host_desktop_engine Linux linux_host_engine ```
1 parent 1505702 commit 6bf8067

File tree

6 files changed

+29
-87
lines changed

6 files changed

+29
-87
lines changed

‎ci/builders/linux_android_aot_engine.json‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424
"profile",
2525
"--android",
2626
"--android-cpu",
27-
"arm",
28-
"--rbe",
29-
"--no-goma"
27+
"arm"
3028
],
3129
"name": "android_profile",
3230
"ninja": {
@@ -63,9 +61,7 @@
6361
"release",
6462
"--android",
6563
"--android-cpu",
66-
"arm",
67-
"--rbe",
68-
"--no-goma"
64+
"arm"
6965
],
7066
"name": "android_release",
7167
"ninja": {
@@ -103,9 +99,7 @@
10399
"release",
104100
"--android",
105101
"--android-cpu",
106-
"arm64",
107-
"--rbe",
108-
"--no-goma"
102+
"arm64"
109103
],
110104
"name": "android_release_arm64",
111105
"ninja": {
@@ -158,9 +152,7 @@
158152
"--runtime-mode",
159153
"profile",
160154
"--android-cpu",
161-
"arm64",
162-
"--rbe",
163-
"--no-goma"
155+
"arm64"
164156
],
165157
"name": "android_profile_arm64",
166158
"ninja": {
@@ -198,9 +190,7 @@
198190
"profile",
199191
"--android",
200192
"--android-cpu",
201-
"x64",
202-
"--rbe",
203-
"--no-goma"
193+
"x64"
204194
],
205195
"name": "android_profile_x64",
206196
"ninja": {
@@ -238,9 +228,7 @@
238228
"release",
239229
"--android",
240230
"--android-cpu",
241-
"x64",
242-
"--rbe",
243-
"--no-goma"
231+
"x64"
244232
],
245233
"name": "android_release_x64",
246234
"ninja": {

‎ci/builders/linux_android_debug_engine.json‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
"gn": [
2121
"--android",
2222
"--android-cpu=x86",
23-
"--runtime-mode=jit_release",
24-
"--rbe",
25-
"--no-goma"
23+
"--runtime-mode=jit_release"
2624
],
2725
"name": "android_jit_release_x86",
2826
"ninja": {
@@ -74,9 +72,7 @@
7472
"gn": [
7573
"--android",
7674
"--android-cpu=arm",
77-
"--no-lto",
78-
"--rbe",
79-
"--no-goma"
75+
"--no-lto"
8076
],
8177
"name": "android_debug",
8278
"ninja": {
@@ -127,9 +123,7 @@
127123
"gn": [
128124
"--android",
129125
"--android-cpu=arm64",
130-
"--no-lto",
131-
"--rbe",
132-
"--no-goma"
126+
"--no-lto"
133127
],
134128
"name": "android_debug_arm64",
135129
"ninja": {
@@ -150,9 +144,7 @@
150144
"--android",
151145
"--android-cpu=arm64",
152146
"--no-lto",
153-
"--enable-vulkan-validation-layers",
154-
"--rbe",
155-
"--no-goma"
147+
"--enable-vulkan-validation-layers"
156148
],
157149
"name": "android_debug_arm64_validation_layers",
158150
"ninja": {
@@ -184,9 +176,7 @@
184176
"gn": [
185177
"--android",
186178
"--android-cpu=x86",
187-
"--no-lto",
188-
"--rbe",
189-
"--no-goma"
179+
"--no-lto"
190180
],
191181
"name": "android_debug_x86",
192182
"ninja": {
@@ -218,9 +208,7 @@
218208
"gn": [
219209
"--android",
220210
"--android-cpu=x64",
221-
"--no-lto",
222-
"--rbe",
223-
"--no-goma"
211+
"--no-lto"
224212
],
225213
"name": "android_debug_x64",
226214
"ninja": {

‎ci/builders/linux_arm_host_engine.json‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525
"--no-lto",
2626
"--target-os=linux",
2727
"--linux-cpu=arm64",
28-
"--prebuilt-dart-sdk",
29-
"--rbe",
30-
"--no-goma"
28+
"--prebuilt-dart-sdk"
3129
],
3230
"name": "linux_profile_arm64",
3331
"ninja": {
@@ -64,9 +62,7 @@
6462
"debug",
6563
"--target-os=linux",
6664
"--linux-cpu=arm64",
67-
"--prebuilt-dart-sdk",
68-
"--rbe",
69-
"--no-goma"
65+
"--prebuilt-dart-sdk"
7066
],
7167
"name": "linux_debug_arm64",
7268
"ninja": {
@@ -103,9 +99,7 @@
10399
"release",
104100
"--target-os=linux",
105101
"--linux-cpu=arm64",
106-
"--prebuilt-dart-sdk",
107-
"--rbe",
108-
"--no-goma"
102+
"--prebuilt-dart-sdk"
109103
],
110104
"name": "linux_release_arm64",
111105
"ninja": {

‎ci/builders/linux_fuchsia.json‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
"--fuchsia-cpu",
1515
"arm64",
1616
"--runtime-mode",
17-
"profile",
18-
"--rbe",
19-
"--no-goma"
17+
"profile"
2018
],
2119
"name": "fuchsia_profile_arm64",
2220
"ninja": {
@@ -40,9 +38,7 @@
4038
"--fuchsia-cpu",
4139
"arm64",
4240
"--runtime-mode",
43-
"release",
44-
"--rbe",
45-
"--no-goma"
41+
"release"
4642
],
4743
"name": "fuchsia_release_arm64",
4844
"ninja": {
@@ -67,9 +63,7 @@
6763
"arm64",
6864
"--runtime-mode",
6965
"debug",
70-
"--no-lto",
71-
"--rbe",
72-
"--no-goma"
66+
"--no-lto"
7367
],
7468
"name": "fuchsia_debug_arm64",
7569
"ninja": {
@@ -93,9 +87,7 @@
9387
"--fuchsia-cpu",
9488
"x64",
9589
"--runtime-mode",
96-
"profile",
97-
"--rbe",
98-
"--no-goma"
90+
"profile"
9991
],
10092
"name": "fuchsia_profile_x64",
10193
"ninja": {
@@ -118,9 +110,7 @@
118110
"--fuchsia-cpu",
119111
"x64",
120112
"--runtime-mode",
121-
"release",
122-
"--rbe",
123-
"--no-goma"
113+
"release"
124114
],
125115
"name": "fuchsia_release_x64",
126116
"ninja": {
@@ -144,9 +134,7 @@
144134
"x64",
145135
"--runtime-mode",
146136
"debug",
147-
"--no-lto",
148-
"--rbe",
149-
"--no-goma"
137+
"--no-lto"
150138
],
151139
"name": "fuchsia_debug_x64",
152140
"ninja": {

‎ci/builders/linux_host_desktop_engine.json‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
"--runtime-mode",
2424
"debug",
2525
"--enable-fontconfig",
26-
"--prebuilt-dart-sdk",
27-
"--rbe",
28-
"--no-goma"
26+
"--prebuilt-dart-sdk"
2927
],
3028
"name": "host_debug",
3129
"ninja": {
@@ -59,9 +57,7 @@
5957
"profile",
6058
"--no-lto",
6159
"--enable-fontconfig",
62-
"--prebuilt-dart-sdk",
63-
"--rbe",
64-
"--no-goma"
60+
"--prebuilt-dart-sdk"
6561
],
6662
"name": "host_profile",
6763
"ninja": {
@@ -94,9 +90,7 @@
9490
"--runtime-mode",
9591
"release",
9692
"--enable-fontconfig",
97-
"--prebuilt-dart-sdk",
98-
"--rbe",
99-
"--no-goma"
93+
"--prebuilt-dart-sdk"
10094
],
10195
"name": "host_release",
10296
"ninja": {

‎ci/builders/linux_host_engine.json‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
"--runtime-mode",
1414
"debug",
1515
"--unoptimized",
16-
"--prebuilt-dart-sdk",
17-
"--rbe",
18-
"--no-goma"
16+
"--prebuilt-dart-sdk"
1917
],
2018
"name": "host_debug_unopt",
2119
"ninja": {
@@ -41,9 +39,7 @@
4139
"--unoptimized",
4240
"--prebuilt-dart-sdk",
4341
"--target-dir",
44-
"host_debug_impeller_vulkan",
45-
"--rbe",
46-
"--no-goma"
42+
"host_debug_impeller_vulkan"
4743
],
4844
"name": "host_debug_impeller_vulkan",
4945
"ninja": {
@@ -95,9 +91,7 @@
9591
"--runtime-mode",
9692
"debug",
9793
"--prebuilt-dart-sdk",
98-
"--build-embedder-examples",
99-
"--rbe",
100-
"--no-goma"
94+
"--build-embedder-examples"
10195
],
10296
"name": "host_debug",
10397
"ninja": {
@@ -148,9 +142,7 @@
148142
"profile",
149143
"--no-lto",
150144
"--prebuilt-dart-sdk",
151-
"--build-embedder-examples",
152-
"--rbe",
153-
"--no-goma"
145+
"--build-embedder-examples"
154146
],
155147
"name": "host_profile",
156148
"ninja": {
@@ -200,9 +192,7 @@
200192
"--runtime-mode",
201193
"release",
202194
"--prebuilt-dart-sdk",
203-
"--build-embedder-examples",
204-
"--rbe",
205-
"--no-goma"
195+
"--build-embedder-examples"
206196
],
207197
"name": "host_release",
208198
"ninja": {

0 commit comments

Comments
 (0)