Repository navigation
Commit bd103b8
Remove vestigial
## Summary
Removes the vestigial `download_jdk` gclient var. Closes flutter#187627.
`download_jdk` was declared in
[DEPS:97](https://github.com/flutter/flutter/blob/master/DEPS#L97) 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`:
```python
'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`).
## Changes
- Remove the unused `download_jdk` declaration from `DEPS` (lines 91-92,
including the now-misleading comment "Checkout Java dependencies only on
platforms that do not have java installed on path.")
- Remove `"download_jdk": false` from 22 builder JSONs in
`engine/src/flutter/ci/builders/`. **108 occurrences total.** None of
them did anything; their removal has no behavioral effect.
The OpenJDK download condition itself is unchanged. Builds that don't
actually need the JDK (e.g. `linux_arm64_android_aot_engine`,
`mac_clang_tidy`) still get it on linux-x64/mac 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.
## Context
Found while running validation builds for flutter#187591. Filed flutter#187627 noting
`download_jdk: false` was being ignored. @reidbaker on the issue:
> "I don't actually recall working on this. If it is not used feel free
to delete it."
Doing that here.
## Pre-launch Checklist
- [x] I read the [Contributor
Guide](https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview).
- [x] I read the [Tree
Hygiene](https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md)
wiki page.
- [x] I read and followed the [Flutter Style
Guide](https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md).
- [x] I signed the [CLA](https://cla.developers.google.com/).
- [x] I listed at least one issue that this PR fixes in the description
above.
- [x] All existing and new tests are passing.
## Test plan
- No behavior change. The OpenJDK package is gated only on
`host_os/host_cpu` (unchanged); removing the unreferenced `download_jdk`
var and the no-op `"download_jdk": false` lines from builder configs
cannot change what gets synced.
- `python3 -c "import json; ..."` confirms all 22 modified JSONs still
parse.
- `grep -rn download_jdk DEPS engine/src/flutter/ci/` after the diff
returns empty.
Co-authored-by: Reid Baker <[email protected]>download_jdk gclient var (flutter#188571)1 parent d39d51c commit bd103b8
24 files changed
Lines changed: 7 additions & 119 deletions
File tree
- engine/src/flutter/ci/builders
- standalone
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
90 | | - | |
91 | | - | |
92 | | - | |
93 | 90 | | |
94 | 91 | | |
95 | 92 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
33 | 32 | | |
34 | 33 | | |
35 | 34 | | |
| |||
72 | 71 | | |
73 | 72 | | |
74 | 73 | | |
75 | | - | |
76 | 74 | | |
77 | 75 | | |
78 | 76 | | |
| |||
115 | 113 | | |
116 | 114 | | |
117 | 115 | | |
118 | | - | |
119 | 116 | | |
120 | 117 | | |
121 | 118 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
37 | 36 | | |
38 | 37 | | |
39 | 38 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
61 | 61 | | |
62 | 62 | | |
63 | 63 | | |
64 | | - | |
65 | | - | |
| 64 | + | |
66 | 65 | | |
67 | 66 | | |
68 | 67 | | |
| |||
91 | 90 | | |
92 | 91 | | |
93 | 92 | | |
94 | | - | |
95 | | - | |
| 93 | + | |
96 | 94 | | |
97 | 95 | | |
98 | 96 | | |
| |||
121 | 119 | | |
122 | 120 | | |
123 | 121 | | |
124 | | - | |
125 | | - | |
| 122 | + | |
126 | 123 | | |
127 | 124 | | |
128 | 125 | | |
| |||
151 | 148 | | |
152 | 149 | | |
153 | 150 | | |
154 | | - | |
155 | | - | |
| 151 | + | |
156 | 152 | | |
157 | 153 | | |
158 | 154 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
22 | 21 | | |
23 | 22 | | |
24 | 23 | | |
| |||
48 | 47 | | |
49 | 48 | | |
50 | 49 | | |
51 | | - | |
52 | 50 | | |
53 | 51 | | |
54 | 52 | | |
| |||
78 | 76 | | |
79 | 77 | | |
80 | 78 | | |
81 | | - | |
82 | 79 | | |
83 | 80 | | |
84 | 81 | | |
| |||
124 | 121 | | |
125 | 122 | | |
126 | 123 | | |
127 | | - | |
128 | 124 | | |
129 | 125 | | |
130 | 126 | | |
| |||
154 | 150 | | |
155 | 151 | | |
156 | 152 | | |
157 | | - | |
158 | 153 | | |
159 | 154 | | |
160 | 155 | | |
| |||
185 | 180 | | |
186 | 181 | | |
187 | 182 | | |
188 | | - | |
189 | 183 | | |
190 | 184 | | |
191 | 185 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
33 | 32 | | |
34 | 33 | | |
35 | 34 | | |
| |||
70 | 69 | | |
71 | 70 | | |
72 | 71 | | |
73 | | - | |
74 | 72 | | |
75 | 73 | | |
76 | 74 | | |
| |||
111 | 109 | | |
112 | 110 | | |
113 | 111 | | |
114 | | - | |
115 | 112 | | |
116 | 113 | | |
117 | 114 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
38 | 37 | | |
39 | 38 | | |
40 | 39 | | |
| |||
85 | 84 | | |
86 | 85 | | |
87 | 86 | | |
88 | | - | |
89 | 87 | | |
90 | 88 | | |
91 | 89 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
33 | 32 | | |
34 | 33 | | |
35 | 34 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
15 | 14 | | |
16 | 15 | | |
17 | 16 | | |
| |||
58 | 57 | | |
59 | 58 | | |
60 | 59 | | |
61 | | - | |
62 | 60 | | |
63 | 61 | | |
64 | 62 | | |
| |||
111 | 109 | | |
112 | 110 | | |
113 | 111 | | |
114 | | - | |
115 | 112 | | |
116 | 113 | | |
117 | 114 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
113 | 113 | | |
114 | 114 | | |
115 | 115 | | |
116 | | - | |
117 | 116 | | |
118 | 117 | | |
119 | 118 | | |
| |||
357 | 356 | | |
358 | 357 | | |
359 | 358 | | |
360 | | - | |
361 | 359 | | |
362 | 360 | | |
363 | 361 | | |
| |||
0 commit comments