Skip to content

Commit 569d975

Browse files
authored
Remove remaining download_jdk references (flutter#193562)
Follow-up to flutter#188571, which removed the `download_jdk` gclient var from DEPS and the builder JSONs under `ci/builders/`. Two references were outside that path and got missed: - `engine/src/flutter/.ci.yaml`: the Linux, Mac and Windows `builder_cache` targets still pass `"download_jdk": "true"`. DEPS no longer declares the var, so gclient drops the override and the line does nothing. - `lib/web_ui/dev/generate_builder_json.dart` still emits `'download_jdk': false`. On master today, `felt generate-builder-json` adds three `"download_jdk": false` lines back to `linux_web_engine_test.json`. With this change it regenerates the checked-in file with no diff. No behavior change. After this, `git grep download_jdk` is empty. Part of flutter#187627. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [AI contribution guidelines] and understand my responsibilities, or I am not using AI tools. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [ ] I updated/added relevant in-code documentation (doc comments with `///`). - [ ] If this PR introduces a new feature or capability, I created and linked a website documentation issue or PR in [flutter/website] (or verified none is needed). - [ ] I added new tests to check the change I am making, or this PR is [test-exempt]. - [ ] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [ ] All existing and new tests are passing. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [AI contribution guidelines]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#ai-contribution-guidelines [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [flutter/website]: https://github.com/flutter/website [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md 🤖 Generated with [Claude Code](https://claude.com/claude-code)
1 parent 7b074d2 commit 569d975

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

‎engine/src/flutter/.ci.yaml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ targets:
8787
gclient_variables: >-
8888
{
8989
"download_emsdk": "true",
90-
"download_android_deps": "true",
91-
"download_jdk": "true"
90+
"download_android_deps": "true"
9291
}
9392
timeout: 60
9493

@@ -110,8 +109,7 @@ targets:
110109
]
111110
gclient_variables: >-
112111
{
113-
"download_android_deps": "true",
114-
"download_jdk": "true"
112+
"download_android_deps": "true"
115113
}
116114
timeout: 60
117115

@@ -135,8 +133,7 @@ targets:
135133
]
136134
gclient_variables: >-
137135
{
138-
"download_android_deps": "true",
139-
"download_jdk": "true"
136+
"download_android_deps": "true"
140137
}
141138
timeout: 60
142139

‎engine/src/flutter/lib/web_ui/dev/generate_builder_json.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ class GenerateBuilderJsonCommand extends Command<bool> {
128128
'os=${specificOS ?? platform}',
129129
if (cpu != null) 'cpu=$cpu',
130130
],
131-
'gclient_variables': <String, dynamic>{'download_android_deps': false, 'download_jdk': false},
131+
'gclient_variables': <String, dynamic>{'download_android_deps': false},
132132
'dependencies': <String>[...bundles.map((bundle) => 'web_tests/test_bundles/${bundle.name}')],
133133
'test_dependencies': <dynamic>[
134134
<String, dynamic>{

0 commit comments

Comments
 (0)