Skip to content

Commit c804b6b

Browse files
whessewhesse
committed
Update engine v2 builds to remove gclient_custom_var support
The support for per-build custom gclient variable overrides is removed from the build recipes, so the unused fields in the build configuration json are removed here. This completes the change made in flutter#37351 Bug: flutter/flutter#114656
1 parent a71c0c6 commit c804b6b

File tree

7 files changed

+0
-99
lines changed

7 files changed

+0
-99
lines changed

‎ci/builders/linux_android_aot_engine.json‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
"device_type=none",
1919
"os=Linux"
2020
],
21-
"gclient_custom_vars": {
22-
"download_android_deps": false
23-
},
2421
"gn": [
2522
"--runtime-mode",
2623
"profile",
@@ -58,9 +55,6 @@
5855
"device_type=none",
5956
"os=Linux"
6057
],
61-
"gclient_custom_vars": {
62-
"download_android_deps": false
63-
},
6458
"gn": [
6559
"--runtime-mode",
6660
"release",
@@ -98,9 +92,6 @@
9892
"device_type=none",
9993
"os=Linux"
10094
],
101-
"gclient_custom_vars": {
102-
"download_android_deps": false
103-
},
10495
"gn": [
10596
"--runtime-mode",
10697
"release",
@@ -136,9 +127,6 @@
136127
"device_type=none",
137128
"os=Linux"
138129
],
139-
"gclient_custom_vars": {
140-
"download_android_deps": false
141-
},
142130
"gn": [
143131
"--android",
144132
"--runtime-mode",
@@ -175,9 +163,6 @@
175163
"device_type=none",
176164
"os=Linux"
177165
],
178-
"gclient_custom_vars": {
179-
"download_android_deps": false
180-
},
181166
"gn": [
182167
"--runtime-mode",
183168
"profile",
@@ -214,9 +199,6 @@
214199
"device_type=none",
215200
"os=Linux"
216201
],
217-
"gclient_custom_vars": {
218-
"download_android_deps": false
219-
},
220202
"gn": [
221203
"--runtime-mode",
222204
"release",

‎ci/builders/linux_android_debug_engine.json‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@
6262
"device_type=none",
6363
"os=Linux"
6464
],
65-
"gclient_custom_vars": {
66-
"download_android_deps": false
67-
},
6865
"gn": [
6966
"--android",
7067
"--unoptimized",
@@ -148,9 +145,6 @@
148145
"device_type=none",
149146
"os=Linux"
150147
],
151-
"gclient_custom_vars": {
152-
"download_android_deps": false
153-
},
154148
"gn": [
155149
"--android",
156150
"--android-cpu=arm64",
@@ -183,9 +177,6 @@
183177
"device_type=none",
184178
"os=Linux"
185179
],
186-
"gclient_custom_vars": {
187-
"download_android_deps": false
188-
},
189180
"gn": [
190181
"--android",
191182
"--android-cpu=x86",
@@ -218,9 +209,6 @@
218209
"device_type=none",
219210
"os=Linux"
220211
],
221-
"gclient_custom_vars": {
222-
"download_android_deps": false
223-
},
224212
"gn": [
225213
"--android",
226214
"--android-cpu=x64",

‎ci/builders/linux_arm_host_engine.json‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
"device_type=none",
1616
"os=Linux"
1717
],
18-
"gclient_custom_vars": {
19-
"download_android_deps": false
20-
},
2118
"gn": [
2219
"--runtime-mode",
2320
"profile",
@@ -53,9 +50,6 @@
5350
"device_type=none",
5451
"os=Linux"
5552
],
56-
"gclient_custom_vars": {
57-
"download_android_deps": false
58-
},
5953
"gn": [
6054
"--runtime-mode",
6155
"debug",
@@ -91,9 +85,6 @@
9185
"device_type=none",
9286
"os=Linux"
9387
],
94-
"gclient_custom_vars": {
95-
"download_android_deps": false
96-
},
9788
"gn": [
9889
"--runtime-mode",
9990
"release",

‎ci/builders/linux_host_engine.json‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
"device_type=none",
77
"os=Linux"
88
],
9-
"gclient_custom_vars": {
10-
"download_android_deps": false
11-
},
129
"gn": [
1310
"--runtime-mode",
1411
"debug",
@@ -31,9 +28,6 @@
3128
"device_type=none",
3229
"os=Linux"
3330
],
34-
"gclient_custom_vars": {
35-
"download_android_deps": false
36-
},
3731
"gn": [
3832
"--runtime-mode",
3933
"debug",
@@ -88,9 +82,6 @@
8882
"device_type=none",
8983
"os=Linux"
9084
],
91-
"gclient_custom_vars": {
92-
"download_android_deps": false
93-
},
9485
"gn": [
9586
"--runtime-mode",
9687
"debug",
@@ -128,9 +119,6 @@
128119
"device_type=none",
129120
"os=Linux"
130121
],
131-
"gclient_custom_vars": {
132-
"download_android_deps": false
133-
},
134122
"gn": [
135123
"--runtime-mode",
136124
"profile",
@@ -178,9 +166,6 @@
178166
"device_type=none",
179167
"os=Linux"
180168
],
181-
"gclient_custom_vars": {
182-
"download_android_deps": false
183-
},
184169
"gn": [
185170
"--runtime-mode",
186171
"release",

‎ci/builders/mac_android_aot_engine.json‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
"os=Mac-12",
1717
"cpu=x86"
1818
],
19-
"gclient_custom_vars": {
20-
"download_android_deps": false
21-
},
2219
"gn": [
2320
"--runtime-mode",
2421
"profile",
@@ -50,9 +47,6 @@
5047
"os=Mac-12",
5148
"cpu=x86"
5249
],
53-
"gclient_custom_vars": {
54-
"download_android_deps": false
55-
},
5650
"gn": [
5751
"--runtime-mode",
5852
"profile",
@@ -85,9 +79,6 @@
8579
"os=Mac-12",
8680
"cpu=x86"
8781
],
88-
"gclient_custom_vars": {
89-
"download_android_deps": false
90-
},
9182
"gn": [
9283
"--runtime-mode",
9384
"profile",
@@ -120,9 +111,6 @@
120111
"os=Mac-12",
121112
"cpu=x86"
122113
],
123-
"gclient_custom_vars": {
124-
"download_android_deps": false
125-
},
126114
"gn": [
127115
"--runtime-mode",
128116
"release",
@@ -154,9 +142,6 @@
154142
"os=Mac-12",
155143
"cpu=x86"
156144
],
157-
"gclient_custom_vars": {
158-
"download_android_deps": false
159-
},
160145
"gn": [
161146
"--runtime-mode",
162147
"release",
@@ -189,9 +174,6 @@
189174
"os=Mac-12",
190175
"cpu=x86"
191176
],
192-
"gclient_custom_vars": {
193-
"download_android_deps": false
194-
},
195177
"gn": [
196178
"--runtime-mode",
197179
"release",

‎ci/builders/mac_host_engine.json‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
"os=Mac-12",
2020
"cpu=x86"
2121
],
22-
"gclient_custom_vars": {
23-
"download_android_deps": false
24-
},
2522
"gn": [
2623
"--runtime-mode",
2724
"debug",
@@ -60,9 +57,6 @@
6057
"os=Mac-12",
6158
"cpu=x86"
6259
],
63-
"gclient_custom_vars": {
64-
"download_android_deps": false
65-
},
6660
"gn": [
6761
"--runtime-mode",
6862
"profile",
@@ -113,9 +107,6 @@
113107
"os=Mac-12",
114108
"cpu=x86"
115109
],
116-
"gclient_custom_vars": {
117-
"download_android_deps": false
118-
},
119110
"gn": [
120111
"--runtime-mode",
121112
"release",
@@ -152,9 +143,6 @@
152143
"os=Mac-12",
153144
"cpu=x86"
154145
],
155-
"gclient_custom_vars": {
156-
"download_android_deps": false
157-
},
158146
"gn": [
159147
"--mac",
160148
"--mac-cpu",
@@ -191,9 +179,6 @@
191179
"os=Mac-12",
192180
"cpu=x86"
193181
],
194-
"gclient_custom_vars": {
195-
"download_android_deps": false
196-
},
197182
"gn": [
198183
"--mac",
199184
"--mac-cpu",
@@ -229,9 +214,6 @@
229214
"os=Mac-12",
230215
"cpu=x86"
231216
],
232-
"gclient_custom_vars": {
233-
"download_android_deps": false
234-
},
235217
"gn": [
236218
"--mac",
237219
"--mac-cpu",

‎ci/builders/windows_host_engine.json‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
"device_type=none",
2222
"os=Windows-10"
2323
],
24-
"gclient_custom_vars": {
25-
"download_android_deps": false
26-
},
2724
"gn": [
2825
"--runtime-mode",
2926
"debug",
@@ -74,9 +71,6 @@
7471
"device_type=none",
7572
"os=Windows-10"
7673
],
77-
"gclient_custom_vars": {
78-
"download_android_deps": false
79-
},
8074
"gn": [
8175
"--runtime-mode",
8276
"profile",
@@ -108,9 +102,6 @@
108102
"device_type=none",
109103
"os=Windows-10"
110104
],
111-
"gclient_custom_vars": {
112-
"download_android_deps": false
113-
},
114105
"generators": {},
115106
"gn": [
116107
"--runtime-mode",

0 commit comments

Comments
 (0)