Skip to content

Commit d9216a4

Browse files
committed
Remove vestigial download_jdk gclient var
`download_jdk` was declared in DEPS:97 with default True but no DEPS entry ever referenced it as a condition. The only OpenJDK CIPD entry (`engine/src/flutter/third_party/java/openjdk`) gates only on host_os/host_cpu: 'condition': 'not (host_os == "linux" and host_cpu == "arm64")', So setting `download_jdk: false` in builder configs was a no-op -- OpenJDK was downloaded anyway on every host except linux-arm64 (which is correctly excluded by the host_cpu condition, not by download_jdk). This change: - Removes the unused `download_jdk` declaration from DEPS. - Removes `"download_jdk": false` from 22 builder JSONs across engine/src/flutter/ci/builders/. 108 occurrences in total. None of them did anything; their removal has no behavioral effect. The OpenJDK download condition is unchanged. Builds that don't actually need the JDK (e.g. linux_arm64_android_aot_engine) still get it on linux-x64 hosts -- if that becomes worth optimizing, the OpenJDK condition itself is the right place to add a gate, not a separate variable that doesn't propagate. Closes flutter#187627 @reidbaker noted on the issue: "If it is not used feel free to delete it" -- doing that.
1 parent 7400c96 commit d9216a4

23 files changed

Lines changed: 7 additions & 118 deletions

‎DEPS‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ vars = {
8888
# Checkout Android dependencies only on platforms where we build for Android targets.
8989
'download_android_deps': 'host_os == "mac" or (host_os == "linux" and host_cpu == "x64")',
9090

91-
# Checkout Java dependencies only on platforms that do not have java installed on path.
92-
'download_jdk': True,
93-
9491
# Checkout Windows dependencies only if we are building on Windows.
9592
'download_windows_deps' : 'host_os == "win"',
9693

‎engine/src/flutter/ci/builders/linux_arm_host_engine.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
],
3030
"gclient_variables": {
3131
"download_android_deps": false,
32-
"download_jdk": false,
3332
"use_rbe": true
3433
},
3534
"gn": [
@@ -76,7 +75,6 @@
7675
],
7776
"gclient_variables": {
7877
"download_android_deps": false,
79-
"download_jdk": false,
8078
"use_rbe": true
8179
},
8280
"gn": [
@@ -123,7 +121,6 @@
123121
],
124122
"gclient_variables": {
125123
"download_android_deps": false,
126-
"download_jdk": false,
127124
"use_rbe": true
128125
},
129126
"gn": [

‎engine/src/flutter/ci/builders/linux_clang_tidy.json‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@
6161
"cores=32"
6262
],
6363
"gclient_variables": {
64-
"download_android_deps": false,
65-
"download_jdk": false
64+
"download_android_deps": false
6665
},
6766
"dependencies": [
6867
"ci/host_debug_clang_tidy"
@@ -91,8 +90,7 @@
9190
"cores=32"
9291
],
9392
"gclient_variables": {
94-
"download_android_deps": false,
95-
"download_jdk": false
93+
"download_android_deps": false
9694
},
9795
"dependencies": [
9896
"ci/host_debug_clang_tidy"
@@ -121,8 +119,7 @@
121119
"cores=32"
122120
],
123121
"gclient_variables": {
124-
"download_android_deps": false,
125-
"download_jdk": false
122+
"download_android_deps": false
126123
},
127124
"dependencies": [
128125
"ci/host_debug_clang_tidy"
@@ -151,8 +148,7 @@
151148
"cores=32"
152149
],
153150
"gclient_variables": {
154-
"download_android_deps": false,
155-
"download_jdk": false
151+
"download_android_deps": false
156152
},
157153
"dependencies": [
158154
"ci/host_debug_clang_tidy"

‎engine/src/flutter/ci/builders/linux_fuchsia.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
],
1919
"gclient_variables": {
2020
"download_android_deps": false,
21-
"download_jdk": false,
2221
"use_rbe": true
2322
},
2423
"gn": [
@@ -48,7 +47,6 @@
4847
],
4948
"gclient_variables": {
5049
"download_android_deps": false,
51-
"download_jdk": false,
5250
"use_rbe": true
5351
},
5452
"gn": [
@@ -78,7 +76,6 @@
7876
],
7977
"gclient_variables": {
8078
"download_android_deps": false,
81-
"download_jdk": false,
8279
"use_rbe": true
8380
},
8481
"gn": [
@@ -124,7 +121,6 @@
124121
],
125122
"gclient_variables": {
126123
"download_android_deps": false,
127-
"download_jdk": false,
128124
"use_rbe": true
129125
},
130126
"gn": [
@@ -154,7 +150,6 @@
154150
],
155151
"gclient_variables": {
156152
"download_android_deps": false,
157-
"download_jdk": false,
158153
"run_fuchsia_emu": true,
159154
"use_rbe": true
160155
},
@@ -185,7 +180,6 @@
185180
],
186181
"gclient_variables": {
187182
"download_android_deps": false,
188-
"download_jdk": false,
189183
"run_fuchsia_emu": true,
190184
"use_rbe": true
191185
},

‎engine/src/flutter/ci/builders/linux_host_desktop_engine.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
],
3030
"gclient_variables": {
3131
"download_android_deps": false,
32-
"download_jdk": false,
3332
"use_rbe": true
3433
},
3534
"gn": [
@@ -70,7 +69,6 @@
7069
],
7170
"gclient_variables": {
7271
"download_android_deps": false,
73-
"download_jdk": false,
7472
"use_rbe": true
7573
},
7674
"gn": [
@@ -111,7 +109,6 @@
111109
],
112110
"gclient_variables": {
113111
"download_android_deps": false,
114-
"download_jdk": false,
115112
"use_rbe": true
116113
},
117114
"gn": [

‎engine/src/flutter/ci/builders/linux_host_engine.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
],
3535
"gclient_variables": {
3636
"download_android_deps": false,
37-
"download_jdk": false,
3837
"use_rbe": true
3938
},
4039
"gn": [
@@ -85,7 +84,6 @@
8584
],
8685
"gclient_variables": {
8786
"download_android_deps": false,
88-
"download_jdk": false,
8987
"use_rbe": true
9088
},
9189
"gn": [

‎engine/src/flutter/ci/builders/linux_host_engine_ddm.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
],
3030
"gclient_variables": {
3131
"download_android_deps": false,
32-
"download_jdk": false,
3332
"use_rbe": true
3433
},
3534
"gn": [

‎engine/src/flutter/ci/builders/linux_host_engine_test.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
],
1212
"gclient_variables": {
1313
"download_android_deps": false,
14-
"download_jdk": false,
1514
"use_rbe": true
1615
},
1716
"gn": [
@@ -58,7 +57,6 @@
5857
],
5958
"gclient_variables": {
6059
"download_android_deps": false,
61-
"download_jdk": false,
6260
"use_rbe": true
6361
},
6462
"gn": [
@@ -111,7 +109,6 @@
111109
],
112110
"gclient_variables": {
113111
"download_android_deps": false,
114-
"download_jdk": false,
115112
"use_rbe": true
116113
},
117114
"gn": [

‎engine/src/flutter/ci/builders/linux_unopt.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@
113113
],
114114
"gclient_variables": {
115115
"download_android_deps": false,
116-
"download_jdk": false,
117116
"use_rbe": true
118117
},
119118
"gn": [
@@ -359,7 +358,6 @@
359358
],
360359
"gclient_variables": {
361360
"download_android_deps": false,
362-
"download_jdk": false,
363361
"use_rbe": true
364362
},
365363
"gn": [

‎engine/src/flutter/ci/builders/linux_web_engine_build.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
],
2121
"gclient_variables": {
2222
"download_android_deps": false,
23-
"download_jdk": false,
2423
"download_emsdk": true
2524
},
2625
"gn": [

0 commit comments

Comments
 (0)